From 22e32236ec0b666ed933cbd1f23f36814df0c57d Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 24 Feb 2017 10:21:55 -0700 Subject: [PATCH] AppWidgetManager shouldn't use StorageManager. It's probably looking to detect both STATE_RUNNING_UNLOCKING and STATE_RUNNING_UNLOCKED, so it should use isUserUnlockingOrUnlocked() instead of trying to peek at the low-level CE key status. Test: builds, boots Bug: 29534661 Change-Id: I6aca1721f88ced65abf3bb7cbab550c4dbe27fb7 --- .../java/com/android/server/appwidget/AppWidgetServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 4d2b10610fa8b..c50623e3cd057 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -709,7 +709,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } private boolean isUserRunningAndUnlocked(@UserIdInt int userId) { - return mUserManager.isUserRunning(userId) && StorageManager.isUserKeyUnlocked(userId); + return mUserManager.isUserUnlockingOrUnlocked(userId); } @Override