From fe47b6eefa266e2a43294f6472e58698be711ee2 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Fri, 13 May 2016 18:05:33 +0100
Subject: [PATCH] Skip 'network may be monitored' if dying or locked

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
---
 .../server/devicepolicy/DevicePolicyManagerService.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index d0128b7437671..c59c5f3e1cff8 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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;
             }