commit 5c2183a8cf8661bcc1b6662ddd5ceed6cfeacdcc
author Jeff Sharkey <jsharkey@google.com> Mon Mar 21 21:10:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 21 21:10:56 2016 +0000
tree 1f3060d3b081ea65e0d2475ac70ebfc9b7690089
parent 3dc7c04d80c3d547fc8615387a3c3e4fa0721d4c
parent 1af4a7b5bf611a3af931681ea1514513e9cc4c51

Merge "Skip app widget config changes when user locked." into nyc-dev

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index 8febecc..215be4a 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 @@
                 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(