diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-06-17 20:32:22 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2010-06-23 14:25:37 +0800 |
| commit | 1ef634d277d550ed55b5b7089dfd56ed71815bd6 (patch) | |
| tree | 18a36787b1049fbc9a73d087237c67126678d59b /src/com/android/camera/CameraButtonIntentReceiver.java | |
| parent | ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 (diff) | |
| download | LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.zip LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.tar.gz LegacyCamera-1ef634d277d550ed55b5b7089dfd56ed71815bd6.tar.bz2 | |
Support multiple camera preferences.
Change-Id: I7c8440424c472c9ff61ac22692ce60234d359efe
Diffstat (limited to 'src/com/android/camera/CameraButtonIntentReceiver.java')
| -rw-r--r-- | src/com/android/camera/CameraButtonIntentReceiver.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraButtonIntentReceiver.java b/src/com/android/camera/CameraButtonIntentReceiver.java index 148542d..a2e86ca 100644 --- a/src/com/android/camera/CameraButtonIntentReceiver.java +++ b/src/com/android/camera/CameraButtonIntentReceiver.java @@ -36,7 +36,8 @@ public class CameraButtonIntentReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { // Try to get the camera hardware CameraHolder holder = CameraHolder.instance(); - int cameraId = CameraSettings.readPreferredCameraId(context); + ComboPreferences pref = new ComboPreferences(context); + int cameraId = CameraSettings.readPreferredCameraId(pref); if (holder.tryOpen(cameraId) == null) return; // We are going to launch the camera, so hold the camera for later use |