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

2011-11-04 17:38:11 -07:00
parent 815c7a042d 1999577979
commit 9c4f31c119
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();