summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Philip P. Moltmann <moltmann@google.com> 2016-04-29 12:49:22 -0700
committer Philip P. Moltmann <moltmann@google.com> 2016-05-02 09:44:08 -0700
commitefb1950263b70dc3b7a6cd163bba1f38df54c15c (patch)
tree6ba7c8e3f3667c448c8aefe0497b284644ab9b11
parenta5d3e91cefe3dff8ffe85fa10cc1f65be9693500 (diff)
Check if user is unlocked when handler is executed
When the user gets unlocked we schedule a handler-runnable to do cleanup work. This runnable might be executed after the user is already locked again. Fixes: 28512952 Change-Id: I6c05cbc8adab699e451565d74d56ad0f9b965954
-rw-r--r--services/print/java/com/android/server/print/PrintManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
index f2c995b2fc64..1feb81664e95 100644
--- a/services/print/java/com/android/server/print/PrintManagerService.java
+++ b/services/print/java/com/android/server/print/PrintManagerService.java
@@ -836,6 +836,8 @@ public final class PrintManagerService extends SystemService {
BackgroundThread.getHandler().post(new Runnable() {
@Override
public void run() {
+ if (!mUserManager.isUserUnlockingOrUnlocked(userId)) return;
+
UserState userState;
synchronized (mLock) {
userState = getOrCreateUserStateLocked(userId, true);