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

Commit bf5c3af4 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 

am: 557b68a5

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

Change-Id: Id3b15eb4c67df5a2a2b37afef800467d3064b1ad
parents 7c085e43 557b68a5

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

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

            int userHandle = params[0];





            if (userHandle == UserHandle.USER_ALL) {

            if (userHandle == UserHandle.USER_ALL) {

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

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

                    manageNotification(userInfo.getUserHandle());

                    manageNotification(userInfo.getUserHandle());

                }

                }

            } else {

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

        }





        private void manageNotification(UserHandle userHandle) {

        private void manageNotification(UserHandle userHandle) {

            if (!mUserManager.isUserRunning(userHandle)) {

            if (!mUserManager.isUserUnlocked(userHandle)) {

                return;

                return;

            }

            }