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

Commit 3759ec9b authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera3: Add camera neutral tag."

parents 97f0ed03 20c76f67

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11609,6 +11609,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraMetadata.Key SCALER_CROP_REGION;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_EXPOSURE_TIME;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_FRAME_DURATION;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_NEUTRAL_COLOR_POINT;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_SENSITIVITY;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEMPERATURE;

    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TEST_PATTERN_MODE;

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

+10 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,16 @@ public final class CaptureResult extends CameraMetadata { 
    public static final Key<Float> SENSOR_TEMPERATURE =

            new Key<Float>("android.sensor.temperature", float.class);



    /**

     * <p>The estimated white balance at the time of capture.</p>

     * <p>The estimated white balance encoded as the RGB values of the

     * perfectly neutral color point in the linear native sensor color space.

     * The order of the values is R, G, B; where R is in the lowest index.</p>

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

     */

    public static final Key<Rational[]> SENSOR_NEUTRAL_COLOR_POINT =

            new Key<Rational[]>("android.sensor.neutralColorPoint", Rational[].class);



    /**

     * <p>When enabled, the sensor sends a test pattern instead of

     * doing a real exposure from the camera.</p>