summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-09 18:51:28 +0200
committerDanny Baumann <dannybaumann@web.de>2016-02-10 09:25:02 +0100
commita5ef60dba5ef073526dfba3f38caf72fec51a411 (patch)
treee34a4be3438d3994c998af4ad7ca90546102482f
parent65a9464086be534ffdbcfdb208f3d9b3265b3d7d (diff)
downloadandroid_packages_apps_Snap-a5ef60dba5ef073526dfba3f38caf72fec51a411.zip
android_packages_apps_Snap-a5ef60dba5ef073526dfba3f38caf72fec51a411.tar.gz
android_packages_apps_Snap-a5ef60dba5ef073526dfba3f38caf72fec51a411.tar.bz2
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.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 edb8cf3..2fbe768 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 39f54b9..584076c 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))));
}