diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-11-08 13:21:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-08 13:21:14 -0800 |
| commit | f59f7fb9870c1f285f9bdb5e3ca47a1548527837 (patch) | |
| tree | 9b3829f9f151039c93ca5867d6aad6391e88e534 /src | |
| parent | 7c627c10c9cfaff625601ce477ba6cc9477906a3 (diff) | |
| parent | c309fcde67648ae483cab117a956ce11cf065ffd (diff) | |
| download | LegacyCamera-f59f7fb9870c1f285f9bdb5e3ca47a1548527837.zip LegacyCamera-f59f7fb9870c1f285f9bdb5e3ca47a1548527837.tar.gz LegacyCamera-f59f7fb9870c1f285f9bdb5e3ca47a1548527837.tar.bz2 | |
am c309fcde: am 35c8657f: Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread
* commit 'c309fcde67648ae483cab117a956ce11cf065ffd':
Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 62642ef..24ab449 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -404,8 +404,7 @@ public class CameraSettings { } 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, |