| commit | 22e32236ec0b666ed933cbd1f23f36814df0c57d | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Feb 24 10:21:55 2017 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Fri Feb 24 10:21:58 2017 -0700 |
| tree | 1b4e3360fad7a38205f38406764d12f8c7bafa59 | |
| parent | 830d4b422db2f2ae4af17403ccd1d34fd6f0bd6f [diff] |
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
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 4d2b106..c50623e 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 @@ } private boolean isUserRunningAndUnlocked(@UserIdInt int userId) { - return mUserManager.isUserRunning(userId) && StorageManager.isUserKeyUnlocked(userId); + return mUserManager.isUserUnlockingOrUnlocked(userId); } @Override