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

2016-03-21 21:10:54 +00:00
parent 3dc7c04d80 1af4a7b5bf
commit 5c2183a8cf
1 changed files with 6 additions and 1 deletions
--- 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(