diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-29 23:11:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 23:11:53 +0000 |
| commit | 81b0ba2606ddef45bbf7c703c096589517ebb76f (patch) | |
| tree | c68f2e827e64d280bf24126683cada883849787a /core | |
| parent | 069707ed6fd1399ca90c57741960884773d3cc69 (diff) | |
| parent | 421ddbe6709e391603215beb0e01465f42cc0334 (diff) | |
| download | frameworks_base-81b0ba2606ddef45bbf7c703c096589517ebb76f.zip frameworks_base-81b0ba2606ddef45bbf7c703c096589517ebb76f.tar.gz frameworks_base-81b0ba2606ddef45bbf7c703c096589517ebb76f.tar.bz2 | |
Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev
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 |