diff options
| author | Sascha Haeberling <haeberling@google.com> | 2016-02-09 13:38:18 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2016-05-23 14:15:14 -0700 |
| commit | 9379b09c2a4a98aea3fe123deef3562a7665d6a5 (patch) | |
| tree | 0031f0b1339c95f8245837c3b8449b87fe92facf /src | |
| parent | e1d30cc8b4fb2dff49b3bbe74ffac97e0146d1ef (diff) | |
| download | android_packages_apps_Camera2-9379b09c2a4a98aea3fe123deef3562a7665d6a5.tar.gz android_packages_apps_Camera2-9379b09c2a4a98aea3fe123deef3562a7665d6a5.tar.bz2 android_packages_apps_Camera2-9379b09c2a4a98aea3fe123deef3562a7665d6a5.zip | |
Make Camera support unknown higher hardware support levels.
Bug: 28419624
Change-Id: I37e6348178d9a7234456eab50b0ba57a07c33d51
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java | 12 |
1 files changed, 9 insertions, 3 deletions
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"); } } |