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

Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev am: bc73347152 am: 557b68a5c2

Browse Source 
am: bf5c3af451

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

Change-Id: I9b8c100f13b1250978034e4839cc21bb7b8d2919
This commit is contained in:
Robin Lee
2016-05-17 09:33:39 +00:00
committed by android-build-merger
parent 0c7dbd0130 bf5c3af451
commit 5658916fdb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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;
}