diff options
| author | Adrian Roos <roosa@google.com> | 2014-10-21 21:43:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 21:43:05 +0000 |
| commit | c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9 (patch) | |
| tree | dea43b8fe9b8eace8c6a5ada6034a58b17a841e5 | |
| parent | e463bc388e7f5d83f864b320dde400e390ef5817 (diff) | |
| parent | 7b4a38b197ce43cb286d80fc6c4e9713b2807f13 (diff) | |
| download | frameworks_base-c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9.zip frameworks_base-c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9.tar.gz frameworks_base-c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9.tar.bz2 | |
am 7b4a38b1: Delay discovery of system trust agents
* commit '7b4a38b197ce43cb286d80fc6c4e9713b2807f13':
Delay discovery of system trust agents
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index fefbe0a..f9b1704 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -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); } } |