diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-29 13:41:49 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-05-29 21:00:26 +0000 |
| commit | 421ddbe6709e391603215beb0e01465f42cc0334 (patch) | |
| tree | aa37ae111d75788b1d6ed534573db85101f83475 /core | |
| parent | 8d1de048d7612ec86ba01abc9f8b5eb7d2a2d6e2 (diff) | |
| download | frameworks_base-421ddbe6709e391603215beb0e01465f42cc0334.zip frameworks_base-421ddbe6709e391603215beb0e01465f42cc0334.tar.gz frameworks_base-421ddbe6709e391603215beb0e01465f42cc0334.tar.bz2 | |
Camera2: Fix availableCapabilities incorrect type
Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
Diffstat (limited to 'core')
| -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 cea68d2..2f5b4fe 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -822,8 +822,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see #REQUEST_AVAILABLE_CAPABILITIES_ZSL * @see #REQUEST_AVAILABLE_CAPABILITIES_DNG */ - public static final Key<Integer> REQUEST_AVAILABLE_CAPABILITIES = - new Key<Integer>("android.request.availableCapabilities", int.class); + public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES = + new Key<int[]>("android.request.availableCapabilities", int[].class); /** * <p>A list of all keys that the camera device has available |