Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev

Browse Source
This commit is contained in:
Zhijun He
2014-05-29 23:11:52 +00:00
committed by Android (Google) Code Review
parent 069707ed6f 421ddbe670
commit 81b0ba2606
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraCharacteristics.java
View File

@@ -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