Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."

2012-02-29 22:49:10 -08:00
parent 9a4a1a5414 75e1ce6335
commit e78c8ba82a
1 changed files with 2 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/LockScreen.java
+++ b/policy/src/com/android/internal/policy/impl/LockScreen.java
@@ -231,7 +231,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen {
                if (!mCameraDisabled) {
                    // Start the Camera
                    Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                    try {
                        ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
                    } catch (RemoteException e) {