1 files changed, 9 insertions, 2 deletions
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 7c059aa700..6331ace477 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -2160,10 +2160,17 @@ public final class CarUserService extends ICarUserService.Stub implements CarSer
         }
         synchronized (mLockUser) {
             if (mUserIdForUserSwitchInProcess != USER_NULL) {
+                if (mUserIdForUserSwitchInProcess == toUserId) {
+                    if (DBG) {
+                        Slogf.d(TAG, "Ignoring, not legacy");
+                    }
+                    return;
+                }
                 if (DBG) {
-                    Slogf.d(TAG, "Not needed, 'standard' switch");
+                    Slogf.d(TAG, "Resetting mUserIdForUserSwitchInProcess");
                 }
-                return;
+                mUserIdForUserSwitchInProcess = USER_NULL;
+                mRequestIdForUserSwitchInProcess = 0;
             }
         }