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

2 files changed, 36 insertions, 7 deletions

diff --git a/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java b/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
index ca6e027843..240ba87cc0 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarUserManagerHelperTest.java
@@ -157,6 +157,29 @@ public class CarUserManagerHelperTest {
     }
 
     @Test
+    public void testGetAllPersistentUsers() {
+        // Create two non-ephemeral users.
+        UserInfo user1 = createUserInfoForId(mForegroundUserId);
+        UserInfo user2 = createUserInfoForId(mForegroundUserId + 1);
+        // Create two ephemeral users.
+        UserInfo user3 = new UserInfo(
+              /* id= */mForegroundUserId + 2, /* name = */ "user3", UserInfo.FLAG_EPHEMERAL);
+        UserInfo user4 = new UserInfo(
+              /* id= */mForegroundUserId + 3, /* name = */ "user4", UserInfo.FLAG_EPHEMERAL);
+
+        List<UserInfo> testUsers = Arrays.asList(user1, user2, user3, user4);
+
+        doReturn(new ArrayList<>(testUsers)).when(mUserManager).getUsers(true);
+
+        // Should return all 4 users.
+        assertThat(mCarUserManagerHelper.getAllUsers()).hasSize(4);
+
+        // Should return all non-ephemeral users.
+        assertThat(mCarUserManagerHelper.getAllPersistentUsers()).hasSize(2);
+        assertThat(mCarUserManagerHelper.getAllPersistentUsers()).containsExactly(user1, user2);
+    }
+
+    @Test
     public void testUserCanBeRemoved() {
         UserInfo testInfo = new UserInfo();
 
diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
index a6b48bf8f1..132a7ba9f5 100644
--- a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.UserInfo;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -110,7 +111,6 @@ public class CarUserServiceTest {
         UserInfo admin = new UserInfo(adminUserId, CarUserService.OWNER_NAME, UserInfo.FLAG_ADMIN);
 
         doReturn(users).when(mCarUserManagerHelper).getAllUsers();
-        // doReturn(users).when(mCarUserManagerHelper.getAllUsers());
         doReturn(admin).when(mCarUserManagerHelper).createNewAdminUser(CarUserService.OWNER_NAME);
         doReturn(true).when(mCarUserManagerHelper).switchToUser(admin);
 
@@ -128,17 +128,23 @@ public class CarUserServiceTest {
     public void testDisableModifyAccountsForSystemUserOnFirstRun() {
         List<UserInfo> users = new ArrayList<>();
 
-        int systemUserId = 0;
-        UserInfo user0 = new UserInfo(systemUserId, CarUserService.OWNER_NAME, UserInfo.FLAG_ADMIN);
+        UserInfo user0 = new UserInfo();
+        user0.id = UserHandle.USER_SYSTEM;
+        int adminUserId = 10;
+        UserInfo admin = new UserInfo(adminUserId, CarUserService.OWNER_NAME, UserInfo.FLAG_ADMIN);
 
         doReturn(users).when(mCarUserManagerHelper).getAllUsers();
         doReturn(user0).when(mCarUserManagerHelper).getSystemUserInfo();
+        doReturn(admin).when(mCarUserManagerHelper).createNewAdminUser(CarUserService.OWNER_NAME);
+        doReturn(true).when(mCarUserManagerHelper).switchToUser(admin);
 
         mCarUserService.onReceive(mMockContext,
                 new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED));
 
-        verify(mCarUserManagerHelper).
-                setUserRestriction(user0, UserManager.DISALLOW_MODIFY_ACCOUNTS, true);
+        verify(mCarUserManagerHelper)
+                .setUserRestriction(user0, UserManager.DISALLOW_MODIFY_ACCOUNTS, true);
+        verify(mCarUserManagerHelper)
+                .setLastActiveUser(adminUserId, /* skipGlobalSetting= */ false);
     }
 
     /**
@@ -159,7 +165,7 @@ public class CarUserServiceTest {
         users.add(secUser);
 
         doReturn(users).when(mCarUserManagerHelper).getAllUsers();
-        doReturn(secUserId).when(mCarUserManagerHelper).getLastActiveUser();
+        doReturn(secUserId).when(mCarUserManagerHelper).getInitialUser();
 
         mCarUserService.onReceive(mMockContext,
                 new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED));
@@ -174,7 +180,7 @@ public class CarUserServiceTest {
     public void testLastActiveUserUpdatedOnUserSwitch() {
         int lastActiveUserId = 11;
 
-        doReturn(false).when(mCarUserManagerHelper).isForegroundUserGuest();
+        doReturn(false).when(mCarUserManagerHelper).isForegroundUserEphemeral();
         doReturn(lastActiveUserId).when(mCarUserManagerHelper).getCurrentForegroundUserId();
 
         mCarUserService.onReceive(mMockContext,