Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05772e44 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into... 

Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev am: 8a4f3230 am: c766bd16 am: 2a93d843

Change-Id: I4d13f26e8332c4174884bf1c1db09b2467c18f98
parents 89530297 2a93d843

services/core/java/com/android/server/trust/TrustManagerService.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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,