Merge "Camera: codegen spec update" (0c9f1e5f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -15845,6 +15845,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_3 = 3; // 0x3
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL = 4; // 0x4
		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

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2978,6 +2978,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL}</li>
		* <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}</li>
		* <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_3 3}</li>
		* <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL EXTERNAL}</li>
		* </ul></p>
		* <p>This key is available on all devices.</p>
		*
		@@ -2991,6 +2992,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_FULL
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_3
		* @see #INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL
		*/
		@PublicKey
		public static final Key<Integer> INFO_SUPPORTED_HARDWARE_LEVEL =

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

+32 −0

Original line number	Diff line number	Diff line
		@@ -1134,6 +1134,38 @@ public abstract class CameraMetadata<TKey> {
		*/
		public static final int INFO_SUPPORTED_HARDWARE_LEVEL_3 = 3;

		/**
		* <p>This camera device is backed by an external camera connected to this Android device.</p>
		* <p>The device has capability identical to a LIMITED level device, with the following
		* exceptions:</p>
		* <ul>
		* <li>The device may not report lens/sensor related information such as<ul>
		* <li>{@link CaptureRequest#LENS_FOCAL_LENGTH android.lens.focalLength}</li>
		* <li>{@link CameraCharacteristics#LENS_INFO_HYPERFOCAL_DISTANCE android.lens.info.hyperfocalDistance}</li>
		* <li>{@link CameraCharacteristics#SENSOR_INFO_PHYSICAL_SIZE android.sensor.info.physicalSize}</li>
		* <li>{@link CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL android.sensor.info.whiteLevel}</li>
		* <li>{@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern}</li>
		* <li>{@link CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT android.sensor.info.colorFilterArrangement}</li>
		* <li>{@link CaptureResult#SENSOR_ROLLING_SHUTTER_SKEW android.sensor.rollingShutterSkew}</li>
		* </ul>
		* </li>
		* <li>The device will report 0 for {@link CameraCharacteristics#SENSOR_ORIENTATION android.sensor.orientation}</li>
		* <li>The device has less guarantee on stable framerate, as the framerate partly depends
		* on the external camera being used.</li>
		* </ul>
		*
		* @see CaptureRequest#LENS_FOCAL_LENGTH
		* @see CameraCharacteristics#LENS_INFO_HYPERFOCAL_DISTANCE
		* @see CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN
		* @see CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
		* @see CameraCharacteristics#SENSOR_INFO_PHYSICAL_SIZE
		* @see CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL
		* @see CameraCharacteristics#SENSOR_ORIENTATION
		* @see CaptureResult#SENSOR_ROLLING_SHUTTER_SKEW
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		*/
		public static final int INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL = 4;

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