commit cc4c122ad11651b7c9481144cb9d7f78f2b2ada4
author The Android Automerger <android-build@android.com> Mon Oct 17 20:09:08 2011 -0700
committer The Android Automerger <android-build@android.com> Mon Oct 17 20:09:08 2011 -0700
tree c7ad8ffb4665263464c8bd8b23c93820fe27df1c
parent 52c5c76bddbf3994867a00d0e266b390592486aa
parent e7354f7a5706200b74af7ab02dbe36177ef88711

merge in ics-mr0-release history after reset to ics-mr0

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);