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

Skip 'network may be monitored' if dying or locked

Browse Source 
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
This commit is contained in:
Robin Lee
2016-05-13 18:05:33 +01:00
parent 5b40d70ced
commit fe47b6eefa
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;
}