diff options
author | LuK1337 <priv.luk@gmail.com> | 2016-02-26 14:12:55 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:03:39 +0100 |
commit | 6a1b3353fa49b0daa402c04dbe96308ace6a880b (patch) | |
tree | 26e7a7d5d0ac671ce4e75d62df06b32a22ebfb80 /src | |
parent | a06f22b2a227a20b8d52adefb135ad7f7332ebf1 (diff) | |
download | android_packages_apps_Snap-6a1b3353fa49b0daa402c04dbe96308ace6a880b.tar.gz android_packages_apps_Snap-6a1b3353fa49b0daa402c04dbe96308ace6a880b.tar.bz2 android_packages_apps_Snap-6a1b3353fa49b0daa402c04dbe96308ace6a880b.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')
-rw-r--r-- | 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 39ae82fca..4e852419c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4501,7 +4501,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); @@ -4553,7 +4560,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); |