summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2016-03-21 13:07:32 -0600
committer Jeff Sharkey <jsharkey@android.com> 2016-03-21 13:07:35 -0600
commit1af4a7b5bf611a3af931681ea1514513e9cc4c51 (patch)
treeed013a570f26333317d8c2442e2a1fe3d4712122
parent5a785168975f43a4c6b848342d4439ed1689b2fa (diff)
Skip app widget config changes when user locked.
Bug: 27377050 Change-Id: Ic63b06159cf59106b4e7bc62ec5f3e89d47321c5
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index 8febecc1ce4e..215be4a0ea2e 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -332,7 +332,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
for (int i = N - 1; i >= 0; i--) {
Provider provider = installedProviders.get(i);
- ensureGroupStateLoadedLocked(provider.getUserId());
+ final int userId = provider.getUserId();
+ if (!mUserManager.isUserUnlocked(userId) ||
+ isProfileWithLockedParent(userId)) {
+ continue;
+ }
+ ensureGroupStateLoadedLocked(userId);
if (!removedProviders.contains(provider.id)) {
final boolean changed = updateProvidersForPackageLocked(