Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am: 147fa9f

am: 1a7d856 * commit '1a7d8569840c23099bf39aadc990640f916ef516': Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
2016-03-21 15:28:15 +00:00
parent f2ad4b1ffd 1a7d856984
commit b70f3b03e5
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -246,6 +246,7 @@ public final class ChooseLockSettingsHelper {
        // TODO: Remove once that bug is fixed.
        if (intentSender != null || taskId != -1) {
            outIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            outIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
        }
    }
 }