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

Commit fe47b6ee authored by Robin Lee's avatar Robin Lee
Browse files

Skip 'network may be monitored' if dying or locked 

KeyChain isn't direct boot aware & attempting to bind to a service
inside a dying user isn't going to end well.

Change-Id: I5a0acc34f98c39705ec404765c87e7ac61ca9b71
Fix: 28725354
parent 5b40d70c

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -2658,7 +2658,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            int userHandle = params[0];



            if (userHandle == UserHandle.USER_ALL) {

                for (UserInfo userInfo : mUserManager.getUsers()) {

                for (UserInfo userInfo : mUserManager.getUsers(true)) {

                    manageNotification(userInfo.getUserHandle());

                }

            } else {
@@ -2668,7 +2668,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }



        private void manageNotification(UserHandle userHandle) {

            if (!mUserManager.isUserRunning(userHandle)) {

            if (!mUserManager.isUserUnlocked(userHandle)) {

                return;

            }