commit 42c6acb68103692ce4142d1b013dfced203c2271
author Puneet Lall <puneetl@google.com> Thu Oct 02 22:35:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 02 22:35:11 2014 +0000
tree c593ec4c10028283dfd93af0aeddfe3cc869de31
parent 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1
parent 626e4272456e9478b59b503d6fbd56c8339e0cad

Merge "Close dangling camera proxy" into ub-camera-glacier

src/com/android/camera/app/CameraController.java

diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java
index c87df91..019bb94 100644
--- a/src/com/android/camera/app/CameraController.java
+++ b/src/com/android/camera/app/CameraController.java
@@ -161,7 +161,13 @@
     public void onCameraOpened(CameraAgent.CameraProxy camera) {
         Log.v(TAG, "onCameraOpened");
         if (mRequestingCameraId != camera.getCameraId()) {
-            // Not requesting any camera or not waiting for this one.
+            // Not requesting any camera or not waiting for this one, so close
+            // it.
+            if (mUsingNewApi) {
+                mCameraAgentNg.closeCamera(camera, false);
+            } else {
+                mCameraAgent.closeCamera(camera, false);
+            }
             return;
         }
         mCameraProxy = camera;