commit 7d12ee2873923d9d9d4afe22a228aa72d3f62d9d
author felipeal <felipeal@google.com> Fri Jun 05 09:30:19 2020 -0700
committer felipeal <felipeal@google.com> Fri Jun 05 09:33:29 2020 -0700
tree 2954a1c5f484dcfe0da869ed5304b3c49cf70b5a
parent 88207179e9b2448279d2e4a13abb54d49c3d231b

Fixed current user on legacy Android switch HAL call.

Test: atest CarUserServiceTest UserHalHelperTest
Fixes: 158259354

Change-Id: I8b8097f09f74f7691e950fb80bd596a5fa2642e9

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index bd45abb..62b01f0 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -1626,11 +1626,17 @@
 
     private void notifyHalLegacySwitch(@UserIdInt int fromUserId, @UserIdInt int toUserId) {
         synchronized (mLockUser) {
-            if (mUserIdForUserSwitchInProcess != UserHandle.USER_NULL) return;
+            if (mUserIdForUserSwitchInProcess != UserHandle.USER_NULL) {
+                if (Log.isLoggable(TAG_USER, Log.DEBUG)) {
+                    Log.d(TAG, "notifyHalLegacySwitch(" + fromUserId + ", " + toUserId
+                            + "): not needed, normal switch for " + mUserIdForUserSwitchInProcess);
+                }
+                return;
+            }
         }
 
         // switch HAL user
-        UsersInfo usersInfo = UserHalHelper.newUsersInfo(mUserManager);
+        UsersInfo usersInfo = UserHalHelper.newUsersInfo(mUserManager, fromUserId);
         SwitchUserRequest request = createUserSwitchRequest(toUserId, usersInfo);
         mHal.legacyUserSwitch(request);
     }