Permalink
Browse files

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

… into gingerbread

* commit '35c8657f8b2e031e60908a06152df530e6604657':
  Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
  • Loading branch information...
2 parents b72942e + 35c8657 commit c309fcde67648ae483cab117a956ce11cf065ffd Wu-cheng Li committed with Android Git Automerger Nov 8, 2010
Showing with 1 addition and 2 deletions.
  1. +1 −2 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,

0 comments on commit c309fcd

Please sign in to comment.