camera2: @hide android.statistics.predictedColor* (aef3b7ed) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11532,8 +11532,6 @@ package android.hardware.camera2 {
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACES;		field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACES;
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_DETECT_MODE;		field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_DETECT_MODE;
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_LENS_SHADING_MAP;		field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_LENS_SHADING_MAP;
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_PREDICTED_COLOR_GAINS;
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_PREDICTED_COLOR_TRANSFORM;
	field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_SCENE_FLICKER;		field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_SCENE_FLICKER;
	field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_BLUE;		field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_BLUE;
	field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_GREEN;		field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_GREEN;

core/java/android/hardware/camera2/CaptureRequest.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -400,8 +400,8 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
	* the application in this.</p>		* the application in this.</p>
	*		*
	* @see CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES		* @see CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES
	* @see CaptureRequest#CONTROL_MODE
	* @see CaptureResult#STATISTICS_SCENE_FLICKER		* @see CaptureResult#STATISTICS_SCENE_FLICKER
			* @see CaptureRequest#CONTROL_MODE
	* @see CaptureRequest#CONTROL_AE_MODE		* @see CaptureRequest#CONTROL_AE_MODE
	* @see #CONTROL_AE_ANTIBANDING_MODE_OFF		* @see #CONTROL_AE_ANTIBANDING_MODE_OFF
	* @see #CONTROL_AE_ANTIBANDING_MODE_50HZ		* @see #CONTROL_AE_ANTIBANDING_MODE_50HZ
	@@ -453,12 +453,12 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
	* fields for a given capture will be available in its		* fields for a given capture will be available in its
	* CaptureResult.</p>		* CaptureResult.</p>
	*		*
			* @see CaptureRequest#SENSOR_EXPOSURE_TIME
			* @see CaptureRequest#SENSOR_FRAME_DURATION
	* @see CaptureRequest#SENSOR_SENSITIVITY		* @see CaptureRequest#SENSOR_SENSITIVITY
	* @see CaptureRequest#FLASH_MODE		* @see CaptureRequest#FLASH_MODE
	* @see CameraCharacteristics#FLASH_INFO_AVAILABLE		* @see CameraCharacteristics#FLASH_INFO_AVAILABLE
	* @see CaptureRequest#CONTROL_MODE		* @see CaptureRequest#CONTROL_MODE
	* @see CaptureRequest#SENSOR_EXPOSURE_TIME
	* @see CaptureRequest#SENSOR_FRAME_DURATION
	* @see #CONTROL_AE_MODE_OFF		* @see #CONTROL_AE_MODE_OFF
	* @see #CONTROL_AE_MODE_ON		* @see #CONTROL_AE_MODE_ON
	* @see #CONTROL_AE_MODE_ON_AUTO_FLASH		* @see #CONTROL_AE_MODE_ON_AUTO_FLASH

core/java/android/hardware/camera2/CaptureResult.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -195,12 +195,12 @@ public final class CaptureResult extends CameraMetadata {
	* fields for a given capture will be available in its		* fields for a given capture will be available in its
	* CaptureResult.</p>		* CaptureResult.</p>
	*		*
			* @see CaptureRequest#SENSOR_EXPOSURE_TIME
			* @see CaptureRequest#SENSOR_FRAME_DURATION
	* @see CaptureRequest#SENSOR_SENSITIVITY		* @see CaptureRequest#SENSOR_SENSITIVITY
	* @see CaptureRequest#FLASH_MODE		* @see CaptureRequest#FLASH_MODE
	* @see CameraCharacteristics#FLASH_INFO_AVAILABLE		* @see CameraCharacteristics#FLASH_INFO_AVAILABLE
	* @see CaptureRequest#CONTROL_MODE		* @see CaptureRequest#CONTROL_MODE
	* @see CaptureRequest#SENSOR_EXPOSURE_TIME
	* @see CaptureRequest#SENSOR_FRAME_DURATION
	* @see #CONTROL_AE_MODE_OFF		* @see #CONTROL_AE_MODE_OFF
	* @see #CONTROL_AE_MODE_ON		* @see #CONTROL_AE_MODE_ON
	* @see #CONTROL_AE_MODE_ON_AUTO_FLASH		* @see #CONTROL_AE_MODE_ON_AUTO_FLASH
	@@ -522,8 +522,8 @@ public final class CaptureResult extends CameraMetadata {
	* back to the user in the corresponding result.</p>		* back to the user in the corresponding result.</p>
	*		*
	* @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES		* @see CameraCharacteristics#LENS_INFO_AVAILABLE_APERTURES
	* @see CaptureRequest#SENSOR_EXPOSURE_TIME
	* @see CaptureRequest#SENSOR_SENSITIVITY		* @see CaptureRequest#SENSOR_SENSITIVITY
			* @see CaptureRequest#SENSOR_EXPOSURE_TIME
	* @see CaptureRequest#CONTROL_AE_MODE		* @see CaptureRequest#CONTROL_AE_MODE
	*/		*/
	public static final Key<Float> LENS_APERTURE =		public static final Key<Float> LENS_APERTURE =
	@@ -836,8 +836,10 @@ public final class CaptureResult extends CameraMetadata {
	* see {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} for details.</p>		* see {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} for details.</p>
	* <p>This value should always be calculated by the AWB block,		* <p>This value should always be calculated by the AWB block,
	* regardless of the android.control.* current values.</p>		* regardless of the android.control.* current values.</p>
			* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
	*		*
	* @see CaptureRequest#COLOR_CORRECTION_GAINS		* @see CaptureRequest#COLOR_CORRECTION_GAINS
			* @hide
	*/		*/
	public static final Key<float[]> STATISTICS_PREDICTED_COLOR_GAINS =		public static final Key<float[]> STATISTICS_PREDICTED_COLOR_GAINS =
	new Key<float[]>("android.statistics.predictedColorGains", float[].class);		new Key<float[]>("android.statistics.predictedColorGains", float[].class);
	@@ -858,6 +860,8 @@ public final class CaptureResult extends CameraMetadata {
	* capture settings and color transforms are set by the application.</p>		* capture settings and color transforms are set by the application.</p>
	* <p>This value should always be calculated by the AWB block,		* <p>This value should always be calculated by the AWB block,
	* regardless of the android.control.* current values.</p>		* regardless of the android.control.* current values.</p>
			* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
			* @hide
	*/		*/
	public static final Key<Rational[]> STATISTICS_PREDICTED_COLOR_TRANSFORM =		public static final Key<Rational[]> STATISTICS_PREDICTED_COLOR_TRANSFORM =
	new Key<Rational[]>("android.statistics.predictedColorTransform", Rational[].class);		new Key<Rational[]>("android.statistics.predictedColorTransform", Rational[].class);