diff options
author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-02-09 18:51:28 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:08:19 +0100 |
commit | 81e6b765f07d28172b008a88c5c90754af4d5e69 (patch) | |
tree | 5da125fbda6e1c588d5858dc18b7fd4a7c963f73 | |
parent | 8bfc0856b8be1af3bd9ccb6df1d474ac14c0cc3d (diff) | |
download | android_packages_apps_Snap-81e6b765f07d28172b008a88c5c90754af4d5e69.tar.gz android_packages_apps_Snap-81e6b765f07d28172b008a88c5c90754af4d5e69.tar.bz2 android_packages_apps_Snap-81e6b765f07d28172b008a88c5c90754af4d5e69.zip |
Snap: Fix crash when set infinite touch-focus duration
* java.lang.Integer.valueOf(string) method can't parse
hexadecimal values
Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f21e05a03..4a55002c7 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4366,7 +4366,7 @@ public class PhotoModule } // Set focus time. - mFocusManager.setFocusTime(Integer.valueOf( + mFocusManager.setFocusTime(Integer.decode( mPreferences.getString(CameraSettings.KEY_FOCUS_TIME, mActivity.getString(R.string.pref_camera_focustime_default)))); } else { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 507627f44..edfd9d2d0 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2840,7 +2840,7 @@ public class VideoModule implements CameraModule, mParameters.setFocusMode(mFocusManager.getFocusMode(true)); // Set focus time. - mFocusManager.setFocusTime(Integer.valueOf( + mFocusManager.setFocusTime(Integer.decode( mPreferences.getString(CameraSettings.KEY_VIDEOCAMERA_FOCUS_TIME, mActivity.getString(R.string.pref_camera_video_focustime_default)))); |