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

Commit 69c66f42 authored by Alex Ray's avatar Alex Ray Committed by Android (Google) Code Review
Browse files

Merge "camera2: describe non-full hw level optional tag entries" into klp-dev

parents 31049d76 e83c4ebc

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

+12 −0
Original line number Diff line number Diff line
@@ -487,6 +487,12 @@ public final class CameraCharacteristics extends CameraMetadata { 
     * Gain factor from electrons to raw units when

     * ISO=100

     * </p>

     *

     * <b>Optional</b> - This value may be null on some devices.

     *

     * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> -

     * Present on all devices that report being FULL level hardware devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key.

     */

    public static final Key<Rational> SENSOR_BASE_GAIN_FACTOR =

            new Key<Rational>("android.sensor.baseGainFactor", Rational.class);
@@ -502,6 +508,12 @@ public final class CameraCharacteristics extends CameraMetadata { 
     * values above this, it can be a mix of analog and

     * digital

     * </p>

     *

     * <b>Optional</b> - This value may be null on some devices.

     *

     * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> -

     * Present on all devices that report being FULL level hardware devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key.

     */

    public static final Key<Integer> SENSOR_MAX_ANALOG_SENSITIVITY =

            new Key<Integer>("android.sensor.maxAnalogSensitivity", int.class);

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

+6 −0
Original line number Diff line number Diff line
@@ -722,6 +722,12 @@ public final class CaptureResult extends CameraMetadata { 
     * The thermal diode being queried should be inside the sensor PCB, or

     * somewhere close to it.

     * </p>

     *

     * <b>Optional</b> - This value may be null on some devices.

     *

     * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> -

     * Present on all devices that report being FULL level hardware devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key.

     */

    public static final Key<Float> SENSOR_TEMPERATURE =

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