From a5ef60dba5ef073526dfba3f38caf72fec51a411 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 9 Feb 2016 18:51:28 +0200 Subject: Snap: Fix crash when set infinite touch-focus duration * java.lang.Integer.valueOf(string) method can't parse hexadecimal values Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176 --- src/com/android/camera/PhotoModule.java | 2 +- 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 edb8cf386..2fbe768b0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3560,7 +3560,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 39f54b979..584076c2c 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2531,7 +2531,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)))); } -- cgit v1.2.3