summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-09 18:51:28 +0200
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:50 -0700
commitc5fb493e5c41235146f61703e7e8dd615247b8ff (patch)
tree81e5566a1bf8851ab7fffd21722dadac207bc38d /src
parent9336f0be8c020255ed52f5882dffe80fbb4a5048 (diff)
downloadandroid_packages_apps_Snap-c5fb493e5c41235146f61703e7e8dd615247b8ff.tar.gz
android_packages_apps_Snap-c5fb493e5c41235146f61703e7e8dd615247b8ff.tar.bz2
android_packages_apps_Snap-c5fb493e5c41235146f61703e7e8dd615247b8ff.zip
Snap: Fix crash when set infinite touch-focus duration
* java.lang.Integer.valueOf(string) method can't parse hexadecimal values Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java2
-rw-r--r--src/com/android/camera/VideoModule.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ce8cd19d0..588759df5 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4038,7 +4038,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 0a967bac2..c693d3afc 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2770,7 +2770,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))));