commit a8a8d15b0e164f320cc86e75677c0380dc402524
author Fyodor Kupolov <fkupolov@google.com> Wed May 04 17:48:41 2016 -0700
committer The Android Automerger <android-build@google.com> Thu May 05 14:51:50 2016 -0700
tree 615825c2c0d7a0de788c4cd80eb8a48931c73751
parent 7c0ce3d7646973b8295a4c5a1deaf420d8e38e04

Return from onUserUnlocked if user is no longer unlocked

User can be removed or stopped by the time broadcast is delivered.

Bug: 28582351
Change-Id: I26f1a37a1ed61694679afff458c91438ee4e78cb

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index c62689c..ac2dda3 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -2529,6 +2529,10 @@
         if (isProfileWithLockedParent(userId)) {
             return;
         }
+        if (!mUserManager.isUserUnlockingOrUnlocked(userId)) {
+            Slog.w(TAG, "User " + userId + " is no longer unlocked - exiting");
+            return;
+        }
         synchronized (mLock) {
             ensureGroupStateLoadedLocked(userId);
             reloadWidgetsMaskedStateForGroup(mSecurityPolicy.getGroupParent(userId));