commit | 458ac463742cbac35a2dc8aea0f7a68b9eb6f0f4 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Fri Dec 18 11:21:31 2015 -0800 |
committer | Amith Yamasani <yamasani@google.com> | Fri Dec 18 11:21:31 2015 -0800 |
tree | b3cef8fb82351a4abbdfba5494015b42b286fd1e | |
parent | 374e7ddce2bff8bcef67042e988fdd5477331232 [diff] |
Fix broken user removal Check target user instead of current user, when deciding if user can be stopped. Bug: 26207032 Change-Id: Ibf9cb827943f8fbf8fa3b96a9e04c96d11a36d0a
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 5426b72..43d4e77 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java
@@ -1222,7 +1222,7 @@ } private boolean isCurrentUserLocked(int userId) { - return mCurrentUserId == userId || mTargetUserId == userId; + return userId == getCurrentOrTargetUserIdLocked(); } int setTargetUserIdLocked(int targetUserId) {