Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9402275c authored by Eino-Ville Talvala (Eddy)'s avatar Eino-Ville Talvala (Eddy) Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add flagging library imports to autogenerated files" into main

parents 3780769d 39c21065

core/java/android/hardware/camera2/CameraCharacteristics.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.camera2;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;
@@ -31,6 +32,7 @@ import android.util.Log; 
import android.util.Rational;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.camera.flags.Flags;



import java.util.ArrayList;

import java.util.Collections;

core/java/android/hardware/camera2/CaptureRequest.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.camera2;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;
@@ -34,6 +35,8 @@ import android.util.Log; 
import android.util.SparseArray;

import android.view.Surface;



import com.android.internal.camera.flags.Flags;



import java.util.Collection;

import java.util.Collections;

import java.util.HashMap;

core/java/android/hardware/camera2/CaptureResult.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.camera2;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;
@@ -28,6 +29,8 @@ import android.os.Build; 
import android.util.Log;

import android.util.Rational;



import com.android.internal.camera.flags.Flags;



import java.util.List;



/**