diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:56 -0700 |
| commit | 78b783a4bdea2a248774125307c3c0437f720a06 (patch) | |
| tree | f251cd641deec7c767f7292b6a36a336248b21a4 /src/com/android/camera/CameraSettings.java | |
| parent | 1db6b32f781ac83ca8b7913154a72f2de01acd67 (diff) | |
| parent | 421cebf7c24fcf0fc4def96165729e938a49fc93 (diff) | |
| download | android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.tar.gz android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.tar.bz2 android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.zip | |
Merge "SnapdragonCamera: Update settingsManager and add Dual mode to Scene mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 3066ff85e..da203d52c 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1168,14 +1168,8 @@ public class CameraSettings { } public static int getInitialCameraId(SharedPreferences pref) { - int id = Integer.parseInt(pref.getString(KEY_CAMERA_ID, "0")); - if (id == CaptureModule.BAYER_ID) { - int mode = Integer.parseInt(pref.getString(SettingsManager.KEY_DUAL_CAMERA, "1")); - if (mode == CaptureModule.MONO_MODE) return CaptureModule.MONO_ID; - else return CaptureModule.BAYER_ID; - } else { - return CaptureModule.FRONT_ID; - } + String value = pref.getString(SettingsManager.KEY_INITIAL_CAMERA, "0"); + return Integer.parseInt(value); } public static void writePreferredCameraId(SharedPreferences pref, |