commit 046b8ced839d1b04c32d1207fe53f7639d69453b
author Wei Huang <weih@google.com> Tue Oct 18 05:53:01 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 05:53:01 2011 -0700
tree a6da96986e3a9d2bb7c09fafedd54f0d99e9fdac
parent 136c335a69069bbb07af1a842acc4629c3131139
parent d991766dc3bcc03a02c6648e2cfd54ee4f8cbd9e

Merge "Use calculated frame offset instead of gyroscope." into ics-mr0

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 8cc5816..a66a764 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2078,7 +2078,7 @@
 
     private boolean switchToOtherMode(int mode) {
         if (isFinishing()) return false;
-        mImageSaver.waitDone();
+        if (mImageSaver != null) mImageSaver.waitDone();
         MenuHelper.gotoMode(mode, Camera.this);
         mHandler.removeMessages(FIRST_TIME_INIT);
         finish();

tests/src/com/android/camera/stress/SwitchPreview.java

diff --git a/tests/src/com/android/camera/stress/SwitchPreview.java b/tests/src/com/android/camera/stress/SwitchPreview.java
index 6af915e..c5dd7c1 100755
--- a/tests/src/com/android/camera/stress/SwitchPreview.java
+++ b/tests/src/com/android/camera/stress/SwitchPreview.java
@@ -97,10 +97,13 @@
             for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
                 Thread.sleep(WAIT_FOR_PREVIEW);
                 Intent intent = new Intent();
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.setClass(getInstrumentation().getTargetContext(),
                         VideoCamera.class);
                 getActivity().startActivity(intent);
                 Thread.sleep(WAIT_FOR_PREVIEW);
+                intent = new Intent();
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.setClass(getInstrumentation().getTargetContext(),
                         Camera.class);
                 getActivity().startActivity(intent);