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

Commit 36eb3771 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev 

am: bc733471

* commit 'bc733471':
  Skip 'network may be monitored' if dying or locked

Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa
parents ec200415 bc733471

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;

            }