commit a79c5e1d807e5c86f5f9ced44eac50076596e1ab
author Wu-cheng Li <wuchengli@google.com> Wed Jul 28 16:48:25 2010 -0700
committer Wu-cheng Li <wuchengli@google.com> Mon Sep 27 13:26:47 2010 -0700
tree 9565d584ad988d0f8b6ed9049efd2ef961fc4063
parent 4965375a204e9429715186005d931f552b88b2c1

Do not switch camera if the activity is pausing.

bug:2876907
Change-Id: I581d1ebe07dae56b8e5daa5da320f19e7e531842

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index c62fa22..55223a5 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2101,6 +2101,7 @@
     }
 
     private void switchCameraId(int cameraId) {
+        if (mPausing || !isCameraIdle()) return;
         mCameraId = cameraId;
         CameraSettings.writePreferredCameraId(mPreferences, cameraId);
 

src/com/android/camera/VideoCamera.java

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index fb4e44a..1648e2c 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1091,6 +1091,7 @@
     }
 
     private void switchCameraId(int cameraId) {
+        if (mPausing) return;
         mCameraId = cameraId;
         CameraSettings.writePreferredCameraId(mPreferences, cameraId);