diff options
| -rw-r--r-- | services/core/java/com/android/server/am/UserController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 0ea913f340b0..436167635662 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -1903,6 +1903,7 @@ class UserController implements Handler.Callback { } // Optimization - if there is no pending user switch, return current id + // (no need to acquire lock because mTargetUserId and mCurrentUserId are volatile) if (mTargetUserId == UserHandle.USER_NULL) { return getUserInfo(mCurrentUserId); } @@ -1919,7 +1920,7 @@ class UserController implements Handler.Callback { int getCurrentOrTargetUserId() { synchronized (mLock) { - return mTargetUserId != UserHandle.USER_NULL ? mTargetUserId : mCurrentUserId; + return getCurrentOrTargetUserIdLU(); } } |