Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev

2016-05-05 17:10:44 +00:00
parent c91f5e2971 e09a623bc0
commit 430df0fdb6
1 changed files with 4 additions and 0 deletions
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -2529,6 +2529,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
        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));