diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-05-22 23:40:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 23:40:33 +0000 |
| commit | 5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7 (patch) | |
| tree | 668ef249060825d234ad23953029689ac7b5671c /core/java | |
| parent | e511bab48d6d0b1684c8c29af0aae43cec6c57ed (diff) | |
| parent | 656931d36d030d384359da2cb3b5cae9a8dc7a76 (diff) | |
| download | frameworks_base-5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7.zip frameworks_base-5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7.tar.gz frameworks_base-5cf9d8ac94f4a3e00ef32c382950a9cd5e8fd4a7.tar.bz2 | |
Merge "Camera: update available LSC map mode key type" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 9872ebb..4fe257c 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2472,8 +2472,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE */ @PublicKey - public static final Key<byte[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES = - new Key<byte[]>("android.statistics.info.availableLensShadingMapModes", byte[].class); + public static final Key<int[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES = + new Key<int[]>("android.statistics.info.availableLensShadingMapModes", int[].class); /** * <p>Maximum number of supported points in the |