merge in lmp-mr1-release history after reset to 6e1f41253728e6870de800f88b5aa2cfde60ee8b
diff --git a/tests/src/com/android/camera/stress/CameraLatency.java b/tests/src/com/android/camera/stress/CameraLatency.java
index cda858b..998551a 100755
--- a/tests/src/com/android/camera/stress/CameraLatency.java
+++ b/tests/src/com/android/camera/stress/CameraLatency.java
@@ -19,7 +19,9 @@
import com.android.camera.CameraActivity;
import android.app.Instrumentation;
+import android.content.Intent;
import android.os.Environment;
+import android.provider.MediaStore;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
@@ -60,6 +62,12 @@
@Override
protected void setUp() throws Exception {
+ // Make sure camera starts with still picture capturing mode
+ Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setClass(getInstrumentation().getTargetContext(),
+ CameraActivity.class);
+ setActivityIntent(intent);
getActivity();
super.setUp();
}