diff --git a/api/current.txt b/api/current.txt index aea7f67b4b2b3..5153106eb2a68 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13880,7 +13880,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key REPROCESS_EFFECTIVE_EXPOSURE_FACTOR; field public static final android.hardware.camera2.CaptureResult.Key REQUEST_PIPELINE_DEPTH; field public static final android.hardware.camera2.CaptureResult.Key SCALER_CROP_REGION; - field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_BLACK_LEVEL; + field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_BLACK_LEVEL; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_WHITE_LEVEL; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_EXPOSURE_TIME; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_FRAME_DURATION; diff --git a/api/system-current.txt b/api/system-current.txt index a8b054ae7fd4c..0e80c8f669ded 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -14228,7 +14228,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key REPROCESS_EFFECTIVE_EXPOSURE_FACTOR; field public static final android.hardware.camera2.CaptureResult.Key REQUEST_PIPELINE_DEPTH; field public static final android.hardware.camera2.CaptureResult.Key SCALER_CROP_REGION; - field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_BLACK_LEVEL; + field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_BLACK_LEVEL; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_DYNAMIC_WHITE_LEVEL; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_EXPOSURE_TIME; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_FRAME_DURATION; diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 5f27bcaabd61e..3c2d5030c4322 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -3329,8 +3329,8 @@ public class CaptureResult extends CameraMetadata> { * @see CaptureRequest#SENSOR_SENSITIVITY */ @PublicKey - public static final Key SENSOR_DYNAMIC_BLACK_LEVEL = - new Key("android.sensor.dynamicBlackLevel", android.hardware.camera2.params.BlackLevelPattern.class); + public static final Key SENSOR_DYNAMIC_BLACK_LEVEL = + new Key("android.sensor.dynamicBlackLevel", float[].class); /** *

Maximum raw value output by sensor for this frame.