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

Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev am: 8a4f32305c am: c766bd16d9 am: 2a93d843dd

Browse Source 
Change-Id: Iebc09638d20c7b03052319bef29d408c3c835412
This commit is contained in:
Automerger Merge Worker
2020-02-29 05:33:29 +00:00
parent 8cc4dd385a 2a93d843dd
commit 8d0cb96514
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -1437,7 +1437,8 @@ public class TrustManagerService extends SystemService {
if (DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED.equals(action)) { if (DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED.equals(action)) {
refreshAgentList(getSendingUserId()); refreshAgentList(getSendingUserId());
updateDevicePolicyFeatures(); updateDevicePolicyFeatures();
} else if (Intent.ACTION_USER_ADDED.equals(action)) { } else if (Intent.ACTION_USER_ADDED.equals(action) || Intent.ACTION_USER_STARTED.equals(
action)) {
int userId = getUserId(intent); int userId = getUserId(intent);
if (userId > 0) { if (userId > 0) {
maybeEnableFactoryTrustAgents(mLockPatternUtils, userId); maybeEnableFactoryTrustAgents(mLockPatternUtils, userId);
@@ -1478,6 +1479,7 @@ public class TrustManagerService extends SystemService {
filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
filter.addAction(Intent.ACTION_USER_ADDED); filter.addAction(Intent.ACTION_USER_ADDED);
filter.addAction(Intent.ACTION_USER_REMOVED); filter.addAction(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_STARTED);
context.registerReceiverAsUser(this, context.registerReceiverAsUser(this,
UserHandle.ALL, UserHandle.ALL,
filter, filter,