diff options
author | Ying Zheng | 2018-06-21 17:30:11 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2018-06-21 17:30:11 -0500 |
commit | c3cb52abdbd7dd9b0fb70947242f452440db736c (patch) | |
tree | d0ef11a61e241ce7d12bea60fabbf92b209bc146 /service | |
parent | 8c994a08faafbd2539ff3ce458608010dd82f2d9 (diff) | |
parent | 2f2d640a62ef9afbfe147d85e44ac28a4cb8a1fc (diff) | |
download | platform-packages-services-car-c3cb52abdbd7dd9b0fb70947242f452440db736c.tar.gz platform-packages-services-car-c3cb52abdbd7dd9b0fb70947242f452440db736c.tar.xz platform-packages-services-car-c3cb52abdbd7dd9b0fb70947242f452440db736c.zip |
Merge "Update set last active user to exclude ephemeral users." into pi-dev
Diffstat (limited to 'service')
-rw-r--r-- | service/src/com/android/car/user/CarUserService.java | 3 |
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 | |||
103 | } | 103 | } |
104 | } | 104 | } |
105 | if (intent.getAction() == Intent.ACTION_USER_SWITCHED) { | 105 | if (intent.getAction() == Intent.ACTION_USER_SWITCHED) { |
106 | UserInfo foregroundUser = mCarUserManagerHelper.getCurrentForegroundUserInfo(); | ||
107 | // Update last active user if foreground user is not ephemeral. | 106 | // Update last active user if foreground user is not ephemeral. |
108 | if (!foregroundUser.isEphemeral() && !foregroundUser.isGuest()) { | 107 | if (!mCarUserManagerHelper.isForegroundUserEphemeral()) { |
109 | mCarUserManagerHelper.setLastActiveUser( | 108 | mCarUserManagerHelper.setLastActiveUser( |
110 | mCarUserManagerHelper.getCurrentForegroundUserId(), | 109 | mCarUserManagerHelper.getCurrentForegroundUserId(), |
111 | /* skipGlobalSettings= */ false); | 110 | /* skipGlobalSettings= */ false); |