Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1a7d856

* commit '1a7d8569840c23099bf39aadc990640f916ef516':
  Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
This commit is contained in:
Tony Mak
2016-03-21 15:28:15 +00:00
committed by android-build-merger
parent f2ad4b1ffd 1a7d856984
commit b70f3b03e5
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ChooseLockSettingsHelper.java
View File

@@ -246,6 +246,7 @@ public final class ChooseLockSettingsHelper {
// TODO: Remove once that bug is fixed. // TODO: Remove once that bug is fixed.
if (intentSender != null || taskId != -1) { if (intentSender != null || taskId != -1) {
outIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); outIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
outIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
} }
} }
} }