summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-11-06 16:06:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 16:06:26 -0800
commit5e3050e11420b0d18530442166103276be26fc9b (patch)
tree8826ca33d0543e7d8f3cda649056a129c75e8df8
parent4277a11ec36aab4d38a31aad47be759802b5242b (diff)
parent9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466 (diff)
downloadandroid_packages_apps_Gallery2-5e3050e11420b0d18530442166103276be26fc9b.tar.gz
android_packages_apps_Gallery2-5e3050e11420b0d18530442166103276be26fc9b.tar.bz2
android_packages_apps_Gallery2-5e3050e11420b0d18530442166103276be26fc9b.zip
am 9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466': Fix scenario where launching Gallery launches Camera
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 821bf4532..da5465b93 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -689,7 +689,8 @@ public abstract class PhotoPage extends ActivityState implements
}
private void launchCamera() {
- Intent intent = new Intent(mActivity, CameraActivity.class);
+ Intent intent = new Intent(mActivity, CameraActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mRecenterCameraOnResume = false;
mActivity.startActivity(intent);
}