am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents

* commit '96d3132bd0c57fbf8bb46624045fa1616452d346':
  Delay discovery of system trust agents
This commit is contained in:
Adrian Roos
2014-10-22 21:06:13 +00:00
committed by Android Git Automerger

View File

@@ -120,8 +120,9 @@ public class TrustManagerService extends SystemService {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY && !isSafeMode()) {
mPackageMonitor.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);
mReceiver.register(mContext);
maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_OWNER);
refreshAgentList(UserHandle.USER_ALL);
} else if (phase == SystemService.PHASE_BOOT_COMPLETED && !isSafeMode()) {
maybeEnableFactoryTrustAgents(mLockPatternUtils, UserHandle.USER_OWNER);
}
}