1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 25735ed81..5fac0a803 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1638,8 +1638,6 @@ public class CameraActivity extends Activity
         performDeletion();
         mCurrentModule.pause();
         mOrientationManager.pause();
-        // Close the camera and wait for the operation done.
-        mCameraController.closeCamera(true);
         mPanoramaViewHelper.onPause();
 
         mLocalImagesObserver.setForegroundChangeListener(null);
@@ -1652,6 +1650,17 @@ public class CameraActivity extends Activity
 
         UsageStatistics.instance().backgrounded();
 
+        // Close the camera and wait for the operation done. But if we time out
+        // via RuntimeException, just continue pausing, and request a finish().
+        try {
+            mCameraController.closeCamera(true);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Exception while closing camera", e);
+            if (!isFinishing()) {
+                finish();
+            }
+        }
+
         super.onPause();
     }