Merge \"Allow trust agents to run during provisioning\" into nyc-dev

am: 1dd403b61a

Change-Id: Iff3055ccad07766b2529375a53b3fca60e41efcc
This commit is contained in:
Adrian Roos
2016-06-21 18:10:56 +00:00
committed by android-build-merger

View File

@@ -923,6 +923,11 @@ public class KeyguardViewMediator extends SystemUI {
// In this case, send out ACTION_USER_PRESENT here instead of in
// handleKeyguardDone()
sendUserPresentBroadcast();
} else if (mSystemReady && shouldWaitForProvisioning()) {
// Skipping the lockscreen because we're not yet provisioned, but we still need to
// notify the StrongAuthTracker that it's now safe to run trust agents, in case the
// user sets a credential later.
getLockPatternUtils().userPresent(KeyguardUpdateMonitor.getCurrentUser());
}
}