Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev (4d2d9776) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12824,6 +12824,7 @@ package android.hardware.camera2 {
		field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2
		field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1
		field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3
		field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5
		field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0
		field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1
		field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1155,6 +1155,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR MANUAL_SENSOR}</li>
		* <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING MANUAL_POST_PROCESSING}</li>
		* <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_RAW RAW}</li>
		* <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS}</li>
		* </ul></p>
		* <p>This key is available on all devices.</p>
		*
		@@ -1163,6 +1164,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR
		* @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING
		* @see #REQUEST_AVAILABLE_CAPABILITIES_RAW
		* @see #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS
		*/
		@PublicKey
		public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES =

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

+34 −1

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

		/**
		* <p>The camera device supports accurately reporting the sensor settings for many of
		* the sensor controls while the built-in 3A algorithm is running. This allows
		* reporting of sensor settings even when these settings cannot be manually changed.</p>
		* <p>The values reported for the following controls are guaranteed to be available
		* in the CaptureResult, including when 3A is enabled:</p>
		* <ul>
		* <li>Exposure control<ul>
		* <li>{@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime}</li>
		* </ul>
		* </li>
		* <li>Sensitivity control<ul>
		* <li>{@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</li>
		* </ul>
		* </li>
		* <li>Lens controls (if the lens is adjustable)<ul>
		* <li>{@link CaptureRequest#LENS_FOCUS_DISTANCE android.lens.focusDistance}</li>
		* <li>{@link CaptureRequest#LENS_APERTURE android.lens.aperture}</li>
		* </ul>
		* </li>
		* </ul>
		* <p>This capability is a subset of the MANUAL_SENSOR control capability, and will
		* always be included if the MANUAL_SENSOR capability is available.</p>
		*
		* @see CaptureRequest#LENS_APERTURE
		* @see CaptureRequest#LENS_FOCUS_DISTANCE
		* @see CaptureRequest#SENSOR_EXPOSURE_TIME
		* @see CaptureRequest#SENSOR_SENSITIVITY
		* @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
		*/
		public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5;

		//
		// Enumeration values for CameraCharacteristics#SCALER_CROPPING_TYPE
		//
		@@ -1227,7 +1259,8 @@ public abstract class CameraMetadata<TKey> {
		* image while recording video) use case.</p>
		* <p>The camera device should take the highest-quality image
		* possible (given the other settings) without disrupting the
		* frame rate of video recording. </p>
		* frame rate of video recording.<br />
		* </p>
		* @see CaptureRequest#CONTROL_CAPTURE_INTENT
		*/
		public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4;