From e09a623bc0356a8e01bce9c64ed955ca32d36d28 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Wed, 4 May 2016 17:48:41 -0700 Subject: [PATCH] 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 --- .../com/android/server/appwidget/AppWidgetServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index c62689c22b0dd..ac2dda3492cab 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 @@ 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));