diff options
| author | 2023-09-06 17:35:10 +0000 | |
|---|---|---|
| committer | 2023-09-06 17:35:10 +0000 | |
| commit | 9402275c47ff80b3beb8b97a57a2bfeb7b06707c (patch) | |
| tree | 645720fc8a1ecbf8b50d493170903440dd56c2d3 | |
| parent | 3780769d1e37a7f3788b84481dc1482b913284cd (diff) | |
| parent | 39c21065cd25f7df1aaa057fc4af372f538b6171 (diff) | |
Merge "Camera: Add flagging library imports to autogenerated files" into main
3 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index d352be16ae0c..943f0c4bba0a 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -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; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 703f16553ddb..dd3238414030 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -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; diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 746648ba7ac5..9a800150ef27 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -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; /** |