diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-05-10 14:19:36 -0700 |
|---|---|---|
| committer | Byunghun Jeon <bjeon@codeaurora.org> | 2016-05-31 13:26:52 -0700 |
| commit | 421cebf7c24fcf0fc4def96165729e938a49fc93 (patch) | |
| tree | 54a2acbedf78868624e713144939ca13c8d41893 /src/com/android/camera/CameraSettings.java | |
| parent | 2a853d42d02a7beb054c904df29da07126aeaa35 (diff) | |
| download | android_packages_apps_Snap-421cebf7c24fcf0fc4def96165729e938a49fc93.tar.gz android_packages_apps_Snap-421cebf7c24fcf0fc4def96165729e938a49fc93.tar.bz2 android_packages_apps_Snap-421cebf7c24fcf0fc4def96165729e938a49fc93.zip | |
SnapdragonCamera: Update settingsManager and add Dual mode to Scene mode
Update settingsManager and add Dual mode to Scene mode
Change-Id: I508430840c3fb8c7d0b56a2a63e09b271754fcb4
CRs-Fixed: 1018118
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 e41a49eaf..b9d085f9b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1167,14 +1167,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, |