commit 9c4f31c1190a8b5b2ac9911aa291d57040280a76
author Steven Ross <stross@google.com> Fri Nov 04 17:38:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 04 17:38:11 2011 -0700
tree 9c34dc0dcd41e721cd98fe81d9d1ba3f8f72fe54
parent 815c7a042d58a3e21f71603bfb972a31a79addca
parent 19995779799e20b2844d49af2c97b6896a006991

Merge "Using same task fixes 5486287" into ics-mr1

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 990b6cc..fb4a5cd 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -282,7 +282,6 @@
             fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
             fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,
                     R.string.backup_lock_settings_picker_title);
-            fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
             boolean showTutorial = ALWAY_SHOW_TUTORIAL ||
                     !mChooseLockSettingsHelper.utils().isBiometricWeakEverChosen();