Merge "Camera: Add eyes-free videography metadata" into main (c3f008ed) · Commits · e / os / android_frameworks_base

core/api/current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -19287,6 +19287,7 @@ package android.hardware.camera2 {
		method @NonNull public java.util.List<java.lang.Integer> getSupportedExtensions();
		method public boolean isCaptureProcessProgressAvailable(int);
		method public boolean isPostviewAvailable(int);
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> EFV_PADDING_ZOOM_FACTOR_RANGE;
		field public static final int EXTENSION_AUTOMATIC = 0; // 0x0
		field @Deprecated public static final int EXTENSION_BEAUTY = 1; // 0x1
		field public static final int EXTENSION_BOKEH = 2; // 0x2
		@@ -19888,6 +19889,32 @@ package android.hardware.camera2 {
		field public static final int MAX_THUMBNAIL_DIMENSION = 256; // 0x100
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class ExtensionCaptureRequest {
		ctor public ExtensionCaptureRequest();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @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") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EFV_STABILIZATION_MODE;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_GIMBAL = 1; // 0x1
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_LOCKED = 2; // 0x2
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_OFF = 0; // 0x0
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class ExtensionCaptureResult {
		ctor public ExtensionCaptureResult();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_PADDING_REGION;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EFV_STABILIZATION_MODE;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.PointF[]> EFV_TARGET_COORDINATES;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;
		}

		public class MultiResolutionImageReader implements java.lang.AutoCloseable {
		ctor public MultiResolutionImageReader(@NonNull java.util.Collection<android.hardware.camera2.params.MultiResolutionStreamInfo>, int, @IntRange(from=1) int);
		method public void close();

core/api/lint-baseline.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,14 @@ 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():
		@@ -1087,6 +1095,14 @@ 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):
		@@ -1445,6 +1461,14 @@ UnflaggedApi: android.graphics.text.PositionedGlyphs#getItalicOverride(int):
		New API must be flagged with @FlaggedApi: method 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/CameraCharacteristics.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.impl.ExtensionKey;
		import android.hardware.camera2.impl.PublicKey;
		import android.hardware.camera2.impl.SyntheticKey;
		import android.hardware.camera2.params.DeviceStateSensorOrientationMap;
		@@ -6076,6 +6077,28 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> JPEGR_AVAILABLE_JPEG_R_STALL_DURATIONS_MAXIMUM_RESOLUTION =
		new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.jpegr.availableJpegRStallDurationsMaximumResolution", android.hardware.camera2.params.StreamConfigurationDuration[].class);

		/**
		* <p>Minimum and maximum padding zoom factors supported by this camera device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used for the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension.</p>
		* <p>The minimum and maximum padding zoom factors supported by the device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used as part of the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension feature. This extension specific camera characteristic can be queried using
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#get }.</p>
		* <p><b>Units</b>: A pair of padding zoom factors in floating-points:
		* (minPaddingZoomFactor, maxPaddingZoomFactor)</p>
		* <p><b>Range of valid values:</b><br></p>
		* <p>1.0 < minPaddingZoomFactor <= maxPaddingZoomFactor</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* @hide
		*/
		@ExtensionKey
		@FlaggedApi(Flags.FLAG_CONCERT_MODE)
		public static final Key<android.util.Range<Float>> EFV_PADDING_ZOOM_FACTOR_RANGE =
		new Key<android.util.Range<Float>>("android.efv.paddingZoomFactorRange", new TypeReference<android.util.Range<Float>>() {{ }});

		/*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
		* End generated code
		~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@/

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.graphics.ImageFormat;
		import android.hardware.camera2.CameraCharacteristics.Key;
		import android.hardware.camera2.extension.IAdvancedExtenderImpl;
		import android.hardware.camera2.extension.ICameraExtensionsProxyService;
		import android.hardware.camera2.extension.IImageCaptureExtenderImpl;
		@@ -35,6 +36,8 @@ import android.hardware.camera2.extension.LatencyRange;
		import android.hardware.camera2.extension.SizeList;
		import android.hardware.camera2.impl.CameraExtensionUtils;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.impl.ExtensionKey;
		import android.hardware.camera2.impl.PublicKey;
		import android.hardware.camera2.params.ExtensionSessionConfiguration;
		import android.hardware.camera2.params.StreamConfigurationMap;
		import android.os.Binder;
		@@ -1497,4 +1500,28 @@ public final class CameraExtensionCharacteristics {

		return Collections.unmodifiableSet(ret);
		}


		/**
		* <p>Minimum and maximum padding zoom factors supported by this camera device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used for
		* the {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension.</p>
		* <p>The minimum and maximum padding zoom factors supported by the device for
		* {@link android.hardware.camera2.ExtensionCaptureRequest#EFV_PADDING_ZOOM_FACTOR } used as part of the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* extension feature. This extension specific camera characteristic can be queried using
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#get}.</p>
		* <p><b>Units</b>: A pair of padding zoom factors in floating-points:
		* (minPaddingZoomFactor, maxPaddingZoomFactor)</p>
		* <p><b>Range of valid values:</b><br></p>
		* <p>1.0 < minPaddingZoomFactor <= maxPaddingZoomFactor</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		*/
		@PublicKey
		@NonNull
		@ExtensionKey
		@FlaggedApi(Flags.FLAG_CONCERT_MODE)
		public static final Key<android.util.Range<Float>> EFV_PADDING_ZOOM_FACTOR_RANGE =
		CameraCharacteristics.EFV_PADDING_ZOOM_FACTOR_RANGE;
		}

core/java/android/hardware/camera2/CameraMetadata.java

+36 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.NonNull;
		import android.annotation.TestApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.impl.ExtensionKey;
		import android.hardware.camera2.impl.PublicKey;
		import android.hardware.camera2.impl.SyntheticKey;
		import android.util.Log;
		@@ -276,8 +277,11 @@ public abstract class CameraMetadata<TKey> {
		throw new IllegalArgumentException("key type must be that of a metadata key");
		}

		if (field.getAnnotation(PublicKey.class) == null) {
		// Never expose @hide keys up to the API user
		if (field.getAnnotation(PublicKey.class) == null
		&& field.getAnnotation(ExtensionKey.class) == null) {
		// Never expose @hide keys to the API user unless they are
		// marked as @ExtensionKey, as these keys are publicly accessible via
		// the extension key classes.
		return false;
		}

		@@ -3892,6 +3896,36 @@ public abstract class CameraMetadata<TKey> {
		*/
		public static final int DISTORTION_CORRECTION_MODE_HIGH_QUALITY = 2;

		//
		// Enumeration values for CaptureRequest#EFV_STABILIZATION_MODE
		//

		/**
		* <p>No stabilization.</p>
		* @see CaptureRequest#EFV_STABILIZATION_MODE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CONCERT_MODE)
		public static final int EFV_STABILIZATION_MODE_OFF = 0;

		/**
		* <p>Gimbal stabilization mode.</p>
		* @see CaptureRequest#EFV_STABILIZATION_MODE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CONCERT_MODE)
		public static final int EFV_STABILIZATION_MODE_GIMBAL = 1;

		/**
		* <p>Locked stabilization mode which uses the
		* {@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_EYES_FREE_VIDEOGRAPHY }
		* stabilization to directionally steady the target region.</p>
		* @see CaptureRequest#EFV_STABILIZATION_MODE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CONCERT_MODE)
		public static final int EFV_STABILIZATION_MODE_LOCKED = 2;

		//
		// Enumeration values for CaptureResult#CONTROL_AE_STATE
		//