am 35c8657: Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT."…

… into gingerbread * commit '35c8657f8b2e031e60908a06152df530e6604657': Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
Jib-BAOSP · Nov 8, 2010 · c309fcd · c309fcd
2 parents b72942e + 35c8657
commit c309fcd
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
@@ -380,8 +380,7 @@ public static int getVidoeDurationInMillis(String quality) {
     }
 
     public static int readPreferredCameraId(SharedPreferences pref) {
-        String id = Integer.toString(android.hardware.Camera.CAMERA_ID_DEFAULT);
-        return Integer.parseInt(pref.getString(KEY_CAMERA_ID, id));
+        return Integer.parseInt(pref.getString(KEY_CAMERA_ID, "0"));
     }
 
     public static void writePreferredCameraId(SharedPreferences pref,