am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1

* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76': Using same task fixes 5486287
2011-11-05 00:39:35 +00:00
parent 27dda6637c 9c4f31c119
commit 68953fba71
1 changed files with 0 additions and 1 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -282,7 +282,6 @@ public class ChooseLockGeneric extends PreferenceActivity {
            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();