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

Browse Source 
am: dca21d73ce

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

Change-Id: I2ad80c1ba061d877ec8852f42354ee6dfc5035ca
This commit is contained in:
Fyodor Kupolov
2016-05-05 17:19:06 +00:00
committed by android-build-merger
parent 9fab2e7cad dca21d73ce
commit 950304a8d9
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));