Merge "camera2: Update camera metadata with legacy mode enum." (f4a92fee) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12566,6 +12566,7 @@ package android.hardware.camera2 {
		field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2
		field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0
		field public static final int LENS_FACING_BACK = 1; // 0x1
		field public static final int LENS_FACING_FRONT = 0; // 0x0

+3 −0

Original line number	Diff line number	Diff line
		@@ -1797,6 +1797,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </ul>
		* <p>A LIMITED device may have some or none of the above characteristics.
		* To find out more refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities}.</p>
		* <p>A LEGACY device does not support per-frame control, manual sensor control, manual
		* post-processing, arbitrary cropping regions, and has relaxed performance constraints.</p>
		*
		* @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
		* @see CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_PROC
		@@ -1806,6 +1808,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* @see CameraCharacteristics#SYNC_MAX_LATENCY
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_FULL
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY
		*/
		public static final Key<Integer> INFO_SUPPORTED_HARDWARE_LEVEL =
		new Key<Integer>("android.info.supportedHardwareLevel", int.class);

+7 −2

Original line number	Diff line number	Diff line
		@@ -577,12 +577,17 @@ public abstract class CameraMetadata<TKey> {
		public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0;

		/**
		* <p>This camera device is capable of supporting advanced imaging
		* applications.</p>
		* <p>This camera device is capable of supporting advanced imaging applications.</p>
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		*/
		public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1;

		/**
		* <p>This camera device is running in backward compatibility mode.</p>
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		*/
		public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2;

		//
		// Enumeration values for CameraCharacteristics#SYNC_MAX_LATENCY
		//