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

Commit 153ac102 authored by Zhijun He's avatar Zhijun He
Browse files

Camera2: Update pixelArraySize and analog sensitivity tags 

Change-Id: I07424afb44c70b5bcd600f1265efa969fdeac7e5
parent 53a470af

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

+6 −5
Original line number Diff line number Diff line
@@ -515,8 +515,9 @@ public final class CameraCharacteristics extends CameraMetadata { 


    /**

     * <p>Area of raw data which corresponds to only

     * active pixels; smaller or equal to

     * pixelArraySize.</p>

     * active pixels.</p>

     * <p>It is smaller or equal to

     * sensor full pixel array, which could include the black calibration pixels.</p>

     */

    public static final Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE =

            new Key<android.graphics.Rect>("android.sensor.info.activeArraySize", android.graphics.Rect.class);
@@ -569,11 +570,11 @@ public final class CameraCharacteristics extends CameraMetadata { 


    /**

     * <p>Maximum sensitivity that is implemented

     * purely through analog gain</p>

     * purely through analog gain.</p>

     * <p>For {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity} values less than or

     * equal to this, all applied gain must be analog. For

     * values above this, it can be a mix of analog and

     * digital</p>

     * values above this, the gain applied can be a mix of analog and

     * digital.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     * <p><b>Full capability</b> -

     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the

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

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
    /**

     * <p>The desired mode for for the camera device's flash control.</p>

     * <p>This control is only effective when flash unit is available

     * (<code>{@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} != 0</code>).</p>

     * (<code>{@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} == true</code>).</p>

     * <p>When this control is used, the {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} must be set to ON or OFF.

     * Otherwise, the camera device auto-exposure related flash control (ON_AUTO_FLASH,

     * ON_ALWAYS_FLASH, or ON_AUTO_FLASH_REDEYE) will override this control.</p>

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

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ public final class CaptureResult extends CameraMetadata { 
    /**

     * <p>The desired mode for for the camera device's flash control.</p>

     * <p>This control is only effective when flash unit is available

     * (<code>{@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} != 0</code>).</p>

     * (<code>{@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} == true</code>).</p>

     * <p>When this control is used, the {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} must be set to ON or OFF.

     * Otherwise, the camera device auto-exposure related flash control (ON_AUTO_FLASH,

     * ON_ALWAYS_FLASH, or ON_AUTO_FLASH_REDEYE) will override this control.</p>