X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fandroid%2Fcamera%2Fone%2Fv2%2FOneCameraCharacteristicsImpl.java;h=f7a2b7e178b11b79e572a2668f42c40a72192d59;hb=9379b09c2a4a98aea3fe123deef3562a7665d6a5;hp=279ede3fcdc81e72be876f2911c4c49a10004dd8;hpb=e1d30cc8b4fb2dff49b3bbe74ffac97e0146d1ef;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
index 279ede3fc..f7a2b7e17 100644
--- a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
@@ -139,11 +139,11 @@ public class OneCameraCharacteristicsImpl implements OneCameraCharacteristics {
 
     @Override
     public SupportedHardwareLevel getSupportedHardwareLevel() {
-        Integer supportedHardwareLevel = mCameraCharacteristics.get(CameraCharacteristics
-                .INFO_SUPPORTED_HARDWARE_LEVEL);
+        Integer supportedHardwareLevel = mCameraCharacteristics
+                .get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
         // If this fails, it is a framework bug, per API documentation.
         checkNotNull(supportedHardwareLevel, "INFO_SUPPORTED_HARDWARE_LEVEL not found");
-        switch ((int) supportedHardwareLevel) {
+        switch (supportedHardwareLevel) {
             case CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL:
                 return SupportedHardwareLevel.FULL;
             case CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED:
@@ -151,6 +151,12 @@ public class OneCameraCharacteristicsImpl implements OneCameraCharacteristics {
             case CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY:
                 return SupportedHardwareLevel.LEGACY;
             default:
+                if (supportedHardwareLevel >
+                        CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL) {
+                    Log.i(TAG, "Unknown higher hardware level mapped to FULL: "
+                            + supportedHardwareLevel);
+                    return SupportedHardwareLevel.FULL;
+                }
                 throw new IllegalStateException("Invalid value for INFO_SUPPORTED_HARDWARE_LEVEL");
         }
     }