Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ca722f authored Mar 15, 2018 by Chien-Yu Chen

camera2: Add links for aeState

Test: Build
Bug: 74976641
Change-Id: I5da5a59ae1072c9240c42ad7a38fc25548fcea63

parent d9d45fd7

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1435,9 +1435,11 @@ public abstract class CameraMetadata<TKey> {
	* for the external flash. Otherwise, this mode acts like ON.</p>		* for the external flash. Otherwise, this mode acts like ON.</p>
	* <p>When the external flash is turned off, AE mode should be changed to one of the		* <p>When the external flash is turned off, AE mode should be changed to one of the
	* other available AE modes.</p>		* other available AE modes.</p>
	* <p>If the camera device supports AE external flash mode, aeState must be		* <p>If the camera device supports AE external flash mode, {@link CaptureResult#CONTROL_AE_STATE android.control.aeState} must
	* FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without		* be FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without
	* flash.</p>		* flash.</p>
			*
			* @see CaptureResult#CONTROL_AE_STATE
	* @see CaptureRequest#CONTROL_AE_MODE		* @see CaptureRequest#CONTROL_AE_MODE
	*/		*/
	public static final int CONTROL_AE_MODE_ON_EXTERNAL_FLASH = 5;		public static final int CONTROL_AE_MODE_ON_EXTERNAL_FLASH = 5;

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1001,8 +1001,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
	* </tbody>		* </tbody>
	* </table>		* </table>
	* <p>If the camera device supports AE external flash mode (ON_EXTERNAL_FLASH is included in		* <p>If the camera device supports AE external flash mode (ON_EXTERNAL_FLASH is included in
	* {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES android.control.aeAvailableModes}), aeState must be FLASH_REQUIRED after the camera device		* {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES android.control.aeAvailableModes}), {@link CaptureResult#CONTROL_AE_STATE android.control.aeState} must be FLASH_REQUIRED after
	* finishes AE scan and it's too dark without flash.</p>		* the camera device finishes AE scan and it's too dark without flash.</p>
	* <p>For the above table, the camera device may skip reporting any state changes that happen		* <p>For the above table, the camera device may skip reporting any state changes that happen
	* without application intervention (i.e. mode switch, trigger, locking). Any state that		* without application intervention (i.e. mode switch, trigger, locking). Any state that
	* can be skipped in that manner is called a transient state.</p>		* can be skipped in that manner is called a transient state.</p>
	@@ -1081,6 +1081,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
	* @see CaptureRequest#CONTROL_AE_LOCK		* @see CaptureRequest#CONTROL_AE_LOCK
	* @see CaptureRequest#CONTROL_AE_MODE		* @see CaptureRequest#CONTROL_AE_MODE
	* @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER		* @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER
			* @see CaptureResult#CONTROL_AE_STATE
	* @see CaptureRequest#CONTROL_MODE		* @see CaptureRequest#CONTROL_MODE
	* @see CaptureRequest#CONTROL_SCENE_MODE		* @see CaptureRequest#CONTROL_SCENE_MODE
	* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL