Merge "Camera: Fix lint errors added by EFV APIs" into main (2bc04988) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19910,7 +19910,6 @@ package android.hardware.camera2 {
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureRequest {
		ctor public ExtensionCaptureRequest();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;
		@@ -19923,7 +19922,6 @@ package android.hardware.camera2 {
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureResult {
		ctor public ExtensionCaptureResult();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;

core/api/lint-baseline.txt

+0 −24

Original line number	Diff line number	Diff line
		@@ -245,14 +245,6 @@ BroadcastBehavior: android.telephony.euicc.EuiccManager#ACTION_NOTIFY_CARRIER_SE
		Field 'ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE' is missing @BroadcastBehavior


		CompileTimeConstant: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_GIMBAL:
		All constants must be defined at compile time: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_GIMBAL
		CompileTimeConstant: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_LOCKED:
		All constants must be defined at compile time: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_LOCKED
		CompileTimeConstant: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_OFF:
		All constants must be defined at compile time: android.hardware.camera2.ExtensionCaptureRequest#EFV_STABILIZATION_MODE_OFF


		DeprecationMismatch: android.accounts.AccountManager#newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, String[], boolean, String, String, String[], android.os.Bundle):
		Method android.accounts.AccountManager.newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, String[], boolean, String, String, String[], android.os.Bundle): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
		DeprecationMismatch: android.app.Activity#enterPictureInPictureMode():
		@@ -1095,14 +1087,6 @@ RequiresPermission: android.webkit.WebSettings#setGeolocationEnabled(boolean):
		Method 'setGeolocationEnabled' documentation mentions permissions without declaring @RequiresPermission


		StaticUtils: ExtensionCaptureRequest:
		Fully-static utility classes must not have constructor
		StaticUtils: android.hardware.camera2.ExtensionCaptureRequest:
		Fully-static utility classes must not have constructor
		StaticUtils: android.hardware.camera2.ExtensionCaptureResult:
		Fully-static utility classes must not have constructor


		Todo: android.hardware.camera2.params.StreamConfigurationMap:
		Documentation mentions 'TODO'
		Todo: android.provider.ContactsContract.RawContacts#newEntityIterator(android.database.Cursor):
		@@ -1462,14 +1446,6 @@ UnflaggedApi: android.graphics.text.PositionedGlyphs#getItalicOverride(int):
		UnflaggedApi: android.graphics.text.PositionedGlyphs#getWeightOverride(int):
		New API must be flagged with @FlaggedApi: method android.graphics.text.PositionedGlyphs.getWeightOverride(int)

		UnflaggedApi: android.hardware.camera2.ExtensionCaptureRequest:
		New API must be flagged with @FlaggedApi: class android.hardware.camera2.ExtensionCaptureRequest
		UnflaggedApi: android.hardware.camera2.ExtensionCaptureRequest#ExtensionCaptureRequest():
		New API must be flagged with @FlaggedApi: constructor android.hardware.camera2.ExtensionCaptureRequest()
		UnflaggedApi: android.hardware.camera2.ExtensionCaptureResult:
		New API must be flagged with @FlaggedApi: class android.hardware.camera2.ExtensionCaptureResult
		UnflaggedApi: android.hardware.camera2.ExtensionCaptureResult#ExtensionCaptureResult():
		New API must be flagged with @FlaggedApi: constructor android.hardware.camera2.ExtensionCaptureResult()
		UnflaggedApi: android.media.MediaRoute2Info#TYPE_REMOTE_CAR:
		New API must be flagged with @FlaggedApi: field android.media.MediaRoute2Info.TYPE_REMOTE_CAR
		UnflaggedApi: android.media.MediaRoute2Info#TYPE_REMOTE_COMPUTER:

core/java/android/hardware/camera2/ExtensionCaptureRequest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.hardware.camera2;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.hardware.camera2.CameraCharacteristics;
		import android.hardware.camera2.CaptureRequest;
		import android.hardware.camera2.CaptureRequest.Key;
		import android.hardware.camera2.impl.ExtensionKey;
		@@ -43,6 +42,9 @@ import com.android.internal.camera.flags.Flags;
		@FlaggedApi(Flags.FLAG_CONCERT_MODE_API)
		public final class ExtensionCaptureRequest {

		/** To avoid exposing constructor */
		private ExtensionCaptureRequest() {}

		/**
		* <p>Used to apply an additional digital zoom factor for the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }

core/java/android/hardware/camera2/ExtensionCaptureResult.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.hardware.camera2;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.hardware.camera2.CameraCharacteristics;
		import android.hardware.camera2.CameraExtensionCharacteristics;
		import android.hardware.camera2.CaptureResult;
		import android.hardware.camera2.CaptureResult.Key;
		@@ -45,6 +44,9 @@ import com.android.internal.camera.flags.Flags;
		@FlaggedApi(Flags.FLAG_CONCERT_MODE_API)
		public final class ExtensionCaptureResult {

		/** To avoid exposing constructor */
		private ExtensionCaptureResult() {}

		/**
		* <p>The padding region for the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }