diff options
author | LuK1337 <priv.luk@gmail.com> | 2016-02-26 14:12:55 +0100 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:49 +0200 |
commit | 82969cabe19d43e7e8496d1243e7dbe487faaa6c (patch) | |
tree | 50ee788e2a86fe37d93f0be2e724157aa141a2d6 /src/com/android/camera/PhotoModule.java | |
parent | e6332a892e5efcbfeacd28c470f70198e064eb9d (diff) | |
download | android_packages_apps_Snap-82969cabe19d43e7e8496d1243e7dbe487faaa6c.tar.gz android_packages_apps_Snap-82969cabe19d43e7e8496d1243e7dbe487faaa6c.tar.bz2 android_packages_apps_Snap-82969cabe19d43e7e8496d1243e7dbe487faaa6c.zip |
Snap: Do not crash when cur-focus-scale is null
* Some cameras simply don't set this parameter.
* Also set cur-focus-diopter to 0 if it's null.
Change-Id: Ib1049012de9a58279560c14ed77f83f52c07fe30
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 25f06f8ee..e2a19a9fd 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4208,7 +4208,14 @@ public class PhotoModule final int maxFocusPos = mParameters.getInt(CameraSettings.KEY_MAX_FOCUS_SCALE); //update mparameters to fetch latest focus position mParameters = mCameraDevice.getParameters(); - final int CurFocusPos = mParameters.getInt(CameraSettings.KEY_MANUAL_FOCUS_SCALE); + int CurFocusPos = minFocusPos; + + try { + CurFocusPos = mParameters.getInt(CameraSettings.KEY_MANUAL_FOCUS_SCALE); + } catch (NumberFormatException e) { + // Do nothing + } + focusbar.setProgress(CurFocusPos); focusPositionText.setText("Current focus position is " + CurFocusPos); @@ -4260,7 +4267,8 @@ public class PhotoModule //update mparameters to fetch latest focus position mParameters = mCameraDevice.getParameters(); final String CurFocusPos = mParameters.get(CameraSettings.KEY_MANUAL_FOCUS_DIOPTER); - focusPositionText.setText("Current focus position is " + CurFocusPos); + focusPositionText.setText("Current focus position is " + + (CurFocusPos != null ? CurFocusPos : minFocusStr)); linear.addView(input); linear.addView(focusPositionText); alert.setView(linear); |