From ac9d0a1ce538eb4bd50cba3b257737a05b9ac4e5 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Tue, 15 Jun 2010 16:41:33 +0800
Subject: Support switching between multiple cameras.

Change-Id: Id444ebcd780c67f4990bd6f6b96c74379b6859ab
---
 src/com/android/camera/CameraButtonIntentReceiver.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera/CameraButtonIntentReceiver.java')

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();
-- 
cgit v1.1