am 654314ee: Merge "Camera2: return device list with the only supported device" into klp-dev

* commit '654314eedf642c01ea034a16d452272d9e4aab24':
  Camera2: return device list with the only supported device

1 files changed, 21 insertions, 1 deletions

diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 798ad7b..f5ee367 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -369,10 +369,30 @@ public final class CameraManager {
             }
 
             mDeviceIdList = new ArrayList<String>();
+            CameraMetadataNative info = new CameraMetadataNative();
             for (int i = 0; i < numCameras; ++i) {
                 // Non-removable cameras use integers starting at 0 for their
                 // identifiers
-                mDeviceIdList.add(String.valueOf(i));
+                boolean isDeviceSupported = false;
+                try {
+                    mCameraService.getCameraCharacteristics(i, info);
+                    if (!info.isEmpty()) {
+                        isDeviceSupported = true;
+                    } else {
+                        throw new AssertionError("Expected to get non-empty characteristics");
+                    }
+                } catch(IllegalArgumentException  e) {
+                    // Got a BAD_VALUE from service, meaning that this
+                    // device is not supported.
+                } catch(CameraRuntimeException e) {
+                    throw e.asChecked();
+                } catch(RemoteException e) {
+                    // impossible
+                }
+
+                if (isDeviceSupported) {
+                    mDeviceIdList.add(String.valueOf(i));
+                }
             }
 
         }