From 421ddbe6709e391603215beb0e01465f42cc0334 Mon Sep 17 00:00:00 2001
From: Zhijun He <zhijunhe@google.com>
Date: Thu, 29 May 2014 13:41:49 -0700
Subject: Camera2: Fix availableCapabilities incorrect type

Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
---
 core/java/android/hardware/camera2/CameraCharacteristics.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/java/android')

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
-- 
cgit v1.1