Fix bug 2106774.

It seems to be a problem that we recieved the camera hardware button while
camera application is running.

Change-Id: I67dd2233e38ef530e55c116c2c70f37d026b5530

1 files changed, 6 insertions, 9 deletions

diff --git a/src/com/android/camera/CameraButtonIntentReceiver.java b/src/com/android/camera/CameraButtonIntentReceiver.java
index ce79440..0d9c4fb 100644
--- a/src/com/android/camera/CameraButtonIntentReceiver.java
+++ b/src/com/android/camera/CameraButtonIntentReceiver.java
@@ -27,15 +27,12 @@ public class CameraButtonIntentReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         // Try to get the camera hardware
-        try {
-            CameraHolder holder = CameraHolder.instance();
-            holder.open();
-            holder.keep();
-            holder.release();
-        } catch (CameraHardwareException e) {
-            // ignore the event if camera hardware cannot be connected
-            return;
-        }
+        CameraHolder holder = CameraHolder.instance();
+        if (holder.tryOpen() == null) return;
+
+        // We are going to launch the camera, so hold the camera for later use
+        holder.keep();
+        holder.release();
         Intent i = new Intent(Intent.ACTION_MAIN);
         i.setClass(context, Camera.class);
         i.addCategory("android.intent.category.LAUNCHER");