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
commit1be13e45ee7a6d24cf3f3ba6bb0884328e804e51 (patch)
tree7783715609d59869a65728b6074581f9e69db976
parentb0e3eba1c4d03192986b6cc240b04cd5c98f620b (diff)
parent6f02f74d88efc644d244e9611b56097bf2dcbaec (diff)
downloadandroid_packages_apps_Snap-1be13e45ee7a6d24cf3f3ba6bb0884328e804e51.tar.gz
android_packages_apps_Snap-1be13e45ee7a6d24cf3f3ba6bb0884328e804e51.tar.bz2
android_packages_apps_Snap-1be13e45ee7a6d24cf3f3ba6bb0884328e804e51.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);
}