diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-06-15 16:41:33 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2010-06-23 12:44:35 +0800 |
| commit | ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 (patch) | |
| tree | 3afe1d6a8399087d1fc5c30065464828225a23da /src/com/android/camera/CameraButtonIntentReceiver.java | |
| parent | 186ff08e71d106e329171055accd4395760495ea (diff) | |
| download | LegacyCamera-ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5.zip LegacyCamera-ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5.tar.gz LegacyCamera-ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5.tar.bz2 | |
Support switching between multiple cameras.
Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
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 38f9241..148542d 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(); - if (holder.tryOpen() == null) return; + int cameraId = CameraSettings.readPreferredCameraId(context); + if (holder.tryOpen(cameraId) == null) return; // We are going to launch the camera, so hold the camera for later use holder.keep(); |