summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorVijay kumar Tumati <vtumati@codeaurora.org>2014-03-24 18:45:35 +0530
committerVijay kumar Tumati <vtumati@codeaurora.org>2014-03-26 12:08:08 +0530
commitefabd537a0f8904f90c4d92e0e6140cd951f0bab (patch)
tree70637d75b3e892ef39955bda76563fb0e922f87e /src/com/android/camera/CameraSettings.java
parent71e30d2eab51431b0a6c0a56cf39360dbd69bc14 (diff)
downloadandroid_packages_apps_Snap-efabd537a0f8904f90c4d92e0e6140cd951f0bab.tar.gz
android_packages_apps_Snap-efabd537a0f8904f90c4d92e0e6140cd951f0bab.tar.bz2
android_packages_apps_Snap-efabd537a0f8904f90c4d92e0e6140cd951f0bab.zip
Camera: Open back camera first irrespective of ID
On 8916, we see back camera probed with camera ID 1. We need to open back camera first in these cases as well. Change-Id: Ie3d71afc75ef92bbb95d748cd581252fb8294e1c
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 60656cd08..267de2d55 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -704,12 +704,15 @@ public class CameraSettings {
int n = CameraHolder.instance().getNumberOfCameras();
if (cameraId < 0 || cameraId >= n) {
- writePreferredCameraId(pref, 0);
+ cameraId = 0;
}
+ writePreferredCameraId(pref, cameraId);
}
public static int readPreferredCameraId(SharedPreferences pref) {
- return Integer.parseInt(pref.getString(KEY_CAMERA_ID, "0"));
+ String rearCameraId = Integer.toString(
+ CameraHolder.instance().getBackCameraId());
+ return Integer.parseInt(pref.getString(KEY_CAMERA_ID, rearCameraId));
}
public static void writePreferredCameraId(SharedPreferences pref,