From 421cebf7c24fcf0fc4def96165729e938a49fc93 Mon Sep 17 00:00:00 2001 From: Byunghun Jeon Date: Tue, 10 May 2016 14:19:36 -0700 Subject: 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 --- src/com/android/camera/CameraSettings.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/com/android/camera/CameraSettings.java') 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, -- cgit v1.2.3