From 1af4a7b5bf611a3af931681ea1514513e9cc4c51 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 21 Mar 2016 13:07:32 -0600 Subject: [PATCH] Skip app widget config changes when user locked. Bug: 27377050 Change-Id: Ic63b06159cf59106b4e7bc62ec5f3e89d47321c5 --- .../com/android/server/appwidget/AppWidgetServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 8febecc1ce4e9..215be4a0ea2ef 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(