Merge "Update set last active user to exclude ephemeral users." into pi-dev

1 files changed, 1 insertions, 2 deletions

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 46c762c4..bc5f2025 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -103,9 +103,8 @@ public class CarUserService extends BroadcastReceiver implements CarServiceBase
             }
         }
         if (intent.getAction() == Intent.ACTION_USER_SWITCHED) {
-            UserInfo foregroundUser = mCarUserManagerHelper.getCurrentForegroundUserInfo();
             // Update last active user if foreground user is not ephemeral.
-            if (!foregroundUser.isEphemeral() && !foregroundUser.isGuest()) {
+            if (!mCarUserManagerHelper.isForegroundUserEphemeral()) {
                 mCarUserManagerHelper.setLastActiveUser(
                         mCarUserManagerHelper.getCurrentForegroundUserId(),
                         /* skipGlobalSettings= */ false);