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

Commit 2f6da3e7 authored by Zhijun He's avatar Zhijun He Committed by Android Git Automerger
Browse files

am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 

* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
parents 792d52a5 c1631fd8

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -12183,7 +12183,6 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_CROPPING_TYPE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_STREAM_CONFIGURATION_MAP;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_AVAILABLE_TEST_PATTERN_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_BASE_GAIN_FACTOR;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_BLACK_LEVEL_PATTERN;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_CALIBRATION_TRANSFORM1;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SENSOR_CALIBRATION_TRANSFORM2;
@@ -12589,7 +12588,6 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureResult.Key SENSOR_GREEN_SPLIT;

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

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

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

    field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_DATA;

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

    field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TIMESTAMP;

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

+0 −13
Original line number Diff line number Diff line
@@ -1495,19 +1495,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<Rational[]> SENSOR_FORWARD_MATRIX2 =

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



    /**

     * <p>Gain factor from electrons to raw units when

     * ISO=100</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

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     */

    public static final Key<Rational> SENSOR_BASE_GAIN_FACTOR =

            new Key<Rational>("android.sensor.baseGainFactor", Rational.class);



    /**

     * <p>A fixed black level offset for each of the color filter arrangement

     * (CFA) mosaic channels.</p>

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

+1 −4
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ public abstract class CameraMetadata<TKey> { 
     * <li>Manual sensitivity control<ul>

     * <li>{@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</li>

     * <li>{@link CameraCharacteristics#SENSOR_INFO_SENSITIVITY_RANGE android.sensor.info.sensitivityRange}</li>

     * <li>{@link CameraCharacteristics#SENSOR_BASE_GAIN_FACTOR android.sensor.baseGainFactor}</li>

     * </ul>

     * </li>

     * <li>Manual lens control<ul>
@@ -268,7 +267,6 @@ public abstract class CameraMetadata<TKey> { 
     * result.</p>

     *

     * @see CaptureRequest#BLACK_LEVEL_LOCK

     * @see CameraCharacteristics#SENSOR_BASE_GAIN_FACTOR

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CameraCharacteristics#SENSOR_INFO_EXPOSURE_TIME_RANGE

     * @see CameraCharacteristics#SENSOR_INFO_SENSITIVITY_RANGE
@@ -1292,8 +1290,7 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>If the flash is available and charged, fire flash

     * for this capture based on android.flash.firingPower and

     * android.flash.firingTime.</p>

     * for this capture.</p>

     * @see CaptureRequest#FLASH_MODE

     */

    public static final int FLASH_MODE_SINGLE = 1;

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

+0 −15
Original line number Diff line number Diff line
@@ -2061,21 +2061,6 @@ public final class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
    public static final Key<Long> SENSOR_TIMESTAMP =

            new Key<Long>("android.sensor.timestamp", long.class);



    /**

     * <p>The temperature of the sensor, sampled at the time

     * exposure began for this frame.</p>

     * <p>The thermal diode being queried should be inside the sensor PCB, or

     * somewhere close to it.</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

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     */

    public static final Key<Float> SENSOR_TEMPERATURE =

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



    /**

     * <p>The estimated camera neutral color in the native sensor colorspace at

     * the time of capture.</p>