Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev

am: 147fa9f

* commit '147fa9f542a5509f64009548af221729a66138f5':
  Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible
This commit is contained in:
Tony Mak
2016-03-21 15:25:39 +00:00
committed by android-build-merger

View File

@@ -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);
}
}
}