Merge "Camera2: Add partial flash state" (aaad0047) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11578,6 +11578,7 @@ package android.hardware.camera2 {
	field public static final int FLASH_MODE_TORCH = 2; // 0x2		field public static final int FLASH_MODE_TORCH = 2; // 0x2
	field public static final int FLASH_STATE_CHARGING = 1; // 0x1		field public static final int FLASH_STATE_CHARGING = 1; // 0x1
	field public static final int FLASH_STATE_FIRED = 3; // 0x3		field public static final int FLASH_STATE_FIRED = 3; // 0x3
			field public static final int FLASH_STATE_PARTIAL = 4; // 0x4
	field public static final int FLASH_STATE_READY = 2; // 0x2		field public static final int FLASH_STATE_READY = 2; // 0x2
	field public static final int FLASH_STATE_UNAVAILABLE = 0; // 0x0		field public static final int FLASH_STATE_UNAVAILABLE = 0; // 0x0
	field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1		field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1

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

+12 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1625,38 +1625,37 @@ public abstract class CameraMetadata {
	//		//

	/**		/**
	* <p>No flash on camera</p>		* <p>No flash on camera.</p>
	* @see CaptureResult#FLASH_STATE		* @see CaptureResult#FLASH_STATE
	*/		*/
	public static final int FLASH_STATE_UNAVAILABLE = 0;		public static final int FLASH_STATE_UNAVAILABLE = 0;

	/**		/**
	* <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash is		* <p>Flash is charging and cannot be fired.</p>
	* charging and cannot be fired</p>
	*
	* @see CameraCharacteristics#FLASH_INFO_AVAILABLE
	* @see CaptureResult#FLASH_STATE		* @see CaptureResult#FLASH_STATE
	*/		*/
	public static final int FLASH_STATE_CHARGING = 1;		public static final int FLASH_STATE_CHARGING = 1;

	/**		/**
	* <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash is		* <p>Flash is ready to fire.</p>
	* ready to fire</p>
	*
	* @see CameraCharacteristics#FLASH_INFO_AVAILABLE
	* @see CaptureResult#FLASH_STATE		* @see CaptureResult#FLASH_STATE
	*/		*/
	public static final int FLASH_STATE_READY = 2;		public static final int FLASH_STATE_READY = 2;

	/**		/**
	* <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash fired		* <p>Flash fired for this capture.</p>
	* for this capture</p>
	*
	* @see CameraCharacteristics#FLASH_INFO_AVAILABLE
	* @see CaptureResult#FLASH_STATE		* @see CaptureResult#FLASH_STATE
	*/		*/
	public static final int FLASH_STATE_FIRED = 3;		public static final int FLASH_STATE_FIRED = 3;

			/**
			* <p>Flash partially illuminated this frame. This is usually due to the next
			* or previous frame having the flash fire, and the flash spilling into this capture
			* due to hardware limitations.</p>
			* @see CaptureResult#FLASH_STATE
			*/
			public static final int FLASH_STATE_PARTIAL = 4;

	//		//
	// Enumeration values for CaptureResult#LENS_STATE		// Enumeration values for CaptureResult#LENS_STATE
	//		//

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1164,6 +1164,7 @@ public final class CaptureResult extends CameraMetadata {
	* @see #FLASH_STATE_CHARGING		* @see #FLASH_STATE_CHARGING
	* @see #FLASH_STATE_READY		* @see #FLASH_STATE_READY
	* @see #FLASH_STATE_FIRED		* @see #FLASH_STATE_FIRED
			* @see #FLASH_STATE_PARTIAL
	*/		*/
	public static final Key<Integer> FLASH_STATE =		public static final Key<Integer> FLASH_STATE =
	new Key<Integer>("android.flash.state", int.class);		new Key<Integer>("android.flash.state", int.class);