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

Browse Source 
am: 430df0fdb6

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

Change-Id: Iea5f3874a3992bfdf7d1e6b82f65856ed69d03fd
This commit is contained in:
Fyodor Kupolov
2016-05-05 17:14:49 +00:00
committed by android-build-merger
parent 76dd05fc2a 430df0fdb6
commit dca21d73ce
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)) { if (isProfileWithLockedParent(userId)) {
return; return;
} }
if (!mUserManager.isUserUnlockingOrUnlocked(userId)) {
Slog.w(TAG, "User " + userId + " is no longer unlocked - exiting");
return;
}
synchronized (mLock) { synchronized (mLock) {
ensureGroupStateLoadedLocked(userId); ensureGroupStateLoadedLocked(userId);
reloadWidgetsMaskedStateForGroup(mSecurityPolicy.getGroupParent(userId)); reloadWidgetsMaskedStateForGroup(mSecurityPolicy.getGroupParent(userId));