Merge "Fix broken user removal"

2015-12-18 19:59:19 +00:00
parent 55bed95778 458ac46374
commit 2e9aa7bddc
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -1222,7 +1222,7 @@ final class UserController {
    }

    private boolean isCurrentUserLocked(int userId) {
-        return mCurrentUserId == userId || mTargetUserId == userId;
+        return userId == getCurrentOrTargetUserIdLocked();
    }

    int setTargetUserIdLocked(int targetUserId) {