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

Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fdb6 am: d188a1693f

Browse Source 
am: 06774496a9

* commit '06774496a99b3fe93d65089678979e2387a9edd7':
  Return from onUserUnlocked if user is no longer unlocked

Change-Id: I55c190bbc0e5656d932e4dcff661f05175196953
This commit is contained in:
Fyodor Kupolov
2016-05-05 17:23:05 +00:00
committed by android-build-merger
parent a96b8160f1 06774496a9
commit 4c977e8c3c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -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));