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

Browse Source 
am: bc73347152

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

Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa
This commit is contained in:
Robin Lee
2016-05-17 09:24:59 +00:00
committed by android-build-merger
parent ec200415f5 bc73347152
commit 36eb3771c1
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]; 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;
} }