diff options
| author | Ying Zheng <yizheng@google.com> | 2018-11-08 13:40:07 -0800 |
|---|---|---|
| committer | Ying Zheng <yizheng@google.com> | 2018-11-13 17:56:41 +0000 |
| commit | 107e4ba8a0c4185435f8d2e63cd36074e3201fac (patch) | |
| tree | a4f680a50760cc1af7dc2a5f398b7be872be3818 | |
| parent | 912d64e5a72b0a30ff7c5b74fecd8d4647f8204d (diff) | |
| download | services-107e4ba8a0c4185435f8d2e63cd36074e3201fac.tar.gz | |
Migrate to the new set last active user call.
Bug: 119221077
Test: build
Change-Id: I63a38266afd59dba74bebe661fa6e2650549e467
(cherry picked from commit fb10d13ade27d3b28310b0f861228e40acb426f9)
| -rw-r--r-- | src/com/android/internal/car/CarServiceHelperService.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/internal/car/CarHelperServiceTest.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java index 852909a..e1a66d8 100644 --- a/src/com/android/internal/car/CarServiceHelperService.java +++ b/src/com/android/internal/car/CarServiceHelperService.java @@ -94,8 +94,7 @@ public class CarServiceHelperService extends SystemService { UserInfo admin = mCarUserManagerHelper.createNewAdminUser( CarUserManagerHelper.DEFAULT_FIRST_ADMIN_NAME); mCarUserManagerHelper.switchToUserId(admin.id); - mCarUserManagerHelper.setLastActiveUser( - admin.id, /* skipGlobalSettings= */ false); + mCarUserManagerHelper.setLastActiveUser(admin.id); } else { mCarUserManagerHelper.switchToUserId(mCarUserManagerHelper.getInitialUser()); } diff --git a/tests/src/com/android/internal/car/CarHelperServiceTest.java b/tests/src/com/android/internal/car/CarHelperServiceTest.java index e7a86dd..3d62b0a 100644 --- a/tests/src/com/android/internal/car/CarHelperServiceTest.java +++ b/tests/src/com/android/internal/car/CarHelperServiceTest.java @@ -90,8 +90,7 @@ public class CarHelperServiceTest { mCarServiceHelperService.onBootPhase(SystemService.PHASE_THIRD_PARTY_APPS_CAN_START); - verify(mCarUserManagerHelper) - .setLastActiveUser(admin.id, /* skipGlobalSetting= */ false); + verify(mCarUserManagerHelper).setLastActiveUser(admin.id); } /** |