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

Commit 29ec6e62 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

Remove @UnsupportedAppUsage annotations from generated code.

Revert back to using the greylist file for this code, since the annotations
would be lost next time the code is regenerated.

Bug: 110868826
Test: m

Merged-In: Ib245a2f1457ced34d5b1a3248161fa4a211ba5e9
Change-Id: Ib245a2f1457ced34d5b1a3248161fa4a211ba5e9
parent fc387916
Loading
Loading
Loading
Loading
+53 −0
Original line number Diff line number Diff line
@@ -456,6 +456,59 @@ Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V
Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V
Landroid/graphics/FontFamily;->mNativePtr:J
Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig;
Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_RESULT_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_SESSION_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_MAX_NUM_OUTPUT_STREAMS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_FORMATS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->REQUEST_ID:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureRequest$Key;
Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->QUIRKS_PARTIAL_RESULT:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->REQUEST_FRAME_COUNT:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->REQUEST_ID:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_IDS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_LANDMARKS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_RECTANGLES:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_SCORES:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_LENS_SHADING_MAP:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_TIMESTAMPS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_X_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_Y_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_GAINS:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_TRANSFORM:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->SYNC_FRAME_NUMBER:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key;
Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager;
Landroid/hardware/display/IDisplayManager;->getDisplayInfo(I)Landroid/view/DisplayInfo;
Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+0 −24
Original line number Diff line number Diff line
@@ -773,7 +773,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CaptureRequest#CONTROL_AWB_REGIONS
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> CONTROL_MAX_REGIONS =
            new Key<int[]>("android.control.maxRegions", int[].class);

@@ -879,7 +878,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]> CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS =
            new Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]>("android.control.availableHighSpeedVideoConfigurations", android.hardware.camera2.params.HighSpeedVideoConfiguration[].class);

@@ -1148,7 +1146,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.util.Size> LENS_INFO_SHADING_MAP_SIZE =
            new Key<android.util.Size>("android.lens.info.shadingMapSize", android.util.Size.class);

@@ -1488,7 +1485,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<Byte> QUIRKS_USE_PARTIAL_RESULT =
            new Key<Byte>("android.quirks.usePartialResult", byte.class);

@@ -1526,7 +1522,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_MAX_NUM_OUTPUT_STREAMS =
            new Key<int[]>("android.request.maxNumOutputStreams", int[].class);

@@ -1766,7 +1761,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_AVAILABLE_REQUEST_KEYS =
            new Key<int[]>("android.request.availableRequestKeys", int[].class);

@@ -1792,7 +1786,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_AVAILABLE_RESULT_KEYS =
            new Key<int[]>("android.request.availableResultKeys", int[].class);

@@ -1805,7 +1798,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_AVAILABLE_CHARACTERISTICS_KEYS =
            new Key<int[]>("android.request.availableCharacteristicsKeys", int[].class);

@@ -1852,7 +1844,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_AVAILABLE_SESSION_KEYS =
            new Key<int[]>("android.request.availableSessionKeys", int[].class);

@@ -1873,7 +1864,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS =
            new Key<int[]>("android.request.availablePhysicalCameraRequestKeys", int[].class);

@@ -1889,7 +1879,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<int[]> SCALER_AVAILABLE_FORMATS =
            new Key<int[]>("android.scaler.availableFormats", int[].class);

@@ -1912,7 +1901,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<long[]> SCALER_AVAILABLE_JPEG_MIN_DURATIONS =
            new Key<long[]>("android.scaler.availableJpegMinDurations", long[].class);

@@ -1931,7 +1919,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<android.util.Size[]> SCALER_AVAILABLE_JPEG_SIZES =
            new Key<android.util.Size[]>("android.scaler.availableJpegSizes", android.util.Size[].class);

@@ -1973,7 +1960,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<long[]> SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS =
            new Key<long[]>("android.scaler.availableProcessedMinDurations", long[].class);

@@ -1998,7 +1984,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<android.util.Size[]> SCALER_AVAILABLE_PROCESSED_SIZES =
            new Key<android.util.Size[]>("android.scaler.availableProcessedSizes", android.util.Size[].class);

@@ -2054,7 +2039,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#REQUEST_MAX_NUM_INPUT_STREAMS
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.ReprocessFormatsMap> SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP =
            new Key<android.hardware.camera2.params.ReprocessFormatsMap>("android.scaler.availableInputOutputFormatsMap", android.hardware.camera2.params.ReprocessFormatsMap.class);

@@ -2147,7 +2131,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfiguration[]> SCALER_AVAILABLE_STREAM_CONFIGURATIONS =
            new Key<android.hardware.camera2.params.StreamConfiguration[]>("android.scaler.availableStreamConfigurations", android.hardware.camera2.params.StreamConfiguration[].class);

@@ -2170,7 +2153,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CaptureRequest#SENSOR_FRAME_DURATION
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> SCALER_AVAILABLE_MIN_FRAME_DURATIONS =
            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.scaler.availableMinFrameDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

@@ -2239,7 +2221,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CaptureRequest#SENSOR_FRAME_DURATION
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> SCALER_AVAILABLE_STALL_DURATIONS =
            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.scaler.availableStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

@@ -3135,7 +3116,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see #LED_AVAILABLE_LEDS_TRANSMIT
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> LED_AVAILABLE_LEDS =
            new Key<int[]>("android.led.availableLeds", int[].class);

@@ -3306,7 +3286,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfiguration[]> DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS =
            new Key<android.hardware.camera2.params.StreamConfiguration[]>("android.depth.availableDepthStreamConfigurations", android.hardware.camera2.params.StreamConfiguration[].class);

@@ -3333,7 +3312,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CaptureRequest#SENSOR_FRAME_DURATION
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS =
            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.depth.availableDepthMinFrameDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

@@ -3357,7 +3335,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS =
            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.depth.availableDepthStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);

@@ -3401,7 +3378,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<byte[]> LOGICAL_MULTI_CAMERA_PHYSICAL_IDS =
            new Key<byte[]>("android.logicalMultiCamera.physicalIds", byte[].class);

+0 −8
Original line number Diff line number Diff line
@@ -2080,7 +2080,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<double[]> JPEG_GPS_COORDINATES =
            new Key<double[]>("android.jpeg.gpsCoordinates", double[].class);

@@ -2091,7 +2090,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<String> JPEG_GPS_PROCESSING_METHOD =
            new Key<String>("android.jpeg.gpsProcessingMethod", String.class);

@@ -2102,7 +2100,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Long> JPEG_GPS_TIMESTAMP =
            new Key<Long>("android.jpeg.gpsTimestamp", long.class);

@@ -2438,7 +2435,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Integer> REQUEST_ID =
            new Key<Integer>("android.request.id", int.class);

@@ -2830,7 +2826,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_BLUE =
            new Key<float[]>("android.tonemap.curveBlue", float[].class);

@@ -2848,7 +2843,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_GREEN =
            new Key<float[]>("android.tonemap.curveGreen", float[].class);

@@ -2911,7 +2905,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_RED =
            new Key<float[]>("android.tonemap.curveRed", float[].class);

@@ -3086,7 +3079,6 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Boolean> LED_TRANSMIT =
            new Key<Boolean>("android.led.transmit", boolean.class);

+0 −21
Original line number Diff line number Diff line
@@ -2404,7 +2404,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<double[]> JPEG_GPS_COORDINATES =
            new Key<double[]>("android.jpeg.gpsCoordinates", double[].class);

@@ -2415,7 +2414,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<String> JPEG_GPS_PROCESSING_METHOD =
            new Key<String>("android.jpeg.gpsProcessingMethod", String.class);

@@ -2426,7 +2424,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p>This key is available on all devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Long> JPEG_GPS_TIMESTAMP =
            new Key<Long>("android.jpeg.gpsTimestamp", long.class);

@@ -3053,7 +3050,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<Boolean> QUIRKS_PARTIAL_RESULT =
            new Key<Boolean>("android.quirks.partialResult", boolean.class);

@@ -3072,7 +3068,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<Integer> REQUEST_FRAME_COUNT =
            new Key<Integer>("android.request.frameCount", int.class);

@@ -3086,7 +3081,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Integer> REQUEST_ID =
            new Key<Integer>("android.request.id", int.class);

@@ -3630,7 +3624,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> STATISTICS_FACE_IDS =
            new Key<int[]>("android.statistics.faceIds", int[].class);

@@ -3646,7 +3639,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<int[]> STATISTICS_FACE_LANDMARKS =
            new Key<int[]>("android.statistics.faceLandmarks", int[].class);

@@ -3662,7 +3654,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<android.graphics.Rect[]> STATISTICS_FACE_RECTANGLES =
            new Key<android.graphics.Rect[]>("android.statistics.faceRectangles", android.graphics.Rect[].class);

@@ -3677,7 +3668,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<byte[]> STATISTICS_FACE_SCORES =
            new Key<byte[]>("android.statistics.faceScores", byte[].class);

@@ -3837,7 +3827,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> STATISTICS_LENS_SHADING_MAP =
            new Key<float[]>("android.statistics.lensShadingMap", float[].class);

@@ -3861,7 +3850,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<float[]> STATISTICS_PREDICTED_COLOR_GAINS =
            new Key<float[]>("android.statistics.predictedColorGains", float[].class);

@@ -3888,7 +3876,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @hide
     */
    @Deprecated
    @UnsupportedAppUsage
    public static final Key<Rational[]> STATISTICS_PREDICTED_COLOR_TRANSFORM =
            new Key<Rational[]>("android.statistics.predictedColorTransform", Rational[].class);

@@ -4025,7 +4012,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureResult#SENSOR_TIMESTAMP
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<long[]> STATISTICS_OIS_TIMESTAMPS =
            new Key<long[]>("android.statistics.oisTimestamps", long[].class);

@@ -4041,7 +4027,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> STATISTICS_OIS_X_SHIFTS =
            new Key<float[]>("android.statistics.oisXShifts", float[].class);

@@ -4057,7 +4042,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> STATISTICS_OIS_Y_SHIFTS =
            new Key<float[]>("android.statistics.oisYShifts", float[].class);

@@ -4092,7 +4076,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_BLUE =
            new Key<float[]>("android.tonemap.curveBlue", float[].class);

@@ -4110,7 +4093,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_GREEN =
            new Key<float[]>("android.tonemap.curveGreen", float[].class);

@@ -4173,7 +4155,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see CaptureRequest#TONEMAP_MODE
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<float[]> TONEMAP_CURVE_RED =
            new Key<float[]>("android.tonemap.curveRed", float[].class);

@@ -4348,7 +4329,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Boolean> LED_TRANSMIT =
            new Key<Boolean>("android.led.transmit", boolean.class);

@@ -4438,7 +4418,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * @see #SYNC_FRAME_NUMBER_UNKNOWN
     * @hide
     */
    @UnsupportedAppUsage
    public static final Key<Long> SYNC_FRAME_NUMBER =
            new Key<Long>("android.sync.frameNumber", long.class);