Renamed methods related to starting user in bg visible on display.
Test: atest CarSystemUIUserUtilTest ProfileSwitcherTest
Test: m
Bug: 261538216
Change-Id: I8b7b30fb48d9098cedaac243560693e6c0e20ed7
diff --git a/src/com/android/systemui/car/qc/ProfileSwitcher.java b/src/com/android/systemui/car/qc/ProfileSwitcher.java
index af9f15b..d26d255 100644
--- a/src/com/android/systemui/car/qc/ProfileSwitcher.java
+++ b/src/com/android/systemui/car/qc/ProfileSwitcher.java
@@ -256,7 +256,7 @@
if (mUserTracker.getUserId() == userId) {
return;
}
- if (mUserManager.isUsersOnSecondaryDisplaysSupported()) {
+ if (mUserManager.isVisibleBackgroundUsersSupported()) {
if (mUserManager.getVisibleUsers().stream().anyMatch(
userHandle -> userHandle.getIdentifier() == userId)) {
// TODO_MD - finalize behavior for non-switchable users
@@ -297,7 +297,7 @@
Log.w(TAG, "Cound not stop user " + userId);
return;
}
- am.startUserInBackgroundOnSecondaryDisplay(userId, mContext.getDisplayId());
+ am.startUserInBackgroundVisibleOnDisplay(userId, mContext.getDisplayId());
}
private void logoutUser() {
diff --git a/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java b/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
index a3904c7..f6ea2cd 100644
--- a/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
+++ b/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
@@ -63,7 +63,7 @@
) {
UserHandle processUser = Process.myUserHandle();
boolean isSecondaryUserSystemUI =
- userManager.isUsersOnSecondaryDisplaysSupported()
+ userManager.isVisibleBackgroundUsersSupported()
&& !processUser.isSystem()
&& processUser.getIdentifier() != ActivityManager.getCurrentUser();
int startingUser = isSecondaryUserSystemUI
diff --git a/src/com/android/systemui/car/users/CarSystemUIUserUtil.java b/src/com/android/systemui/car/users/CarSystemUIUserUtil.java
index 6f2cde6..52d9036 100644
--- a/src/com/android/systemui/car/users/CarSystemUIUserUtil.java
+++ b/src/com/android/systemui/car/users/CarSystemUIUserUtil.java
@@ -62,7 +62,7 @@
public static boolean isSecondaryMUMDSystemUI(Context context) {
UserManager userManager = context.getSystemService(UserManager.class);
UserHandle myUserHandle = Process.myUserHandle();
- return userManager.isUsersOnSecondaryDisplaysSupported()
+ return userManager.isVisibleBackgroundUsersSupported()
&& !myUserHandle.isSystem()
&& myUserHandle.getIdentifier() != ActivityManager.getCurrentUser();
}
diff --git a/tests/src/com/android/systemui/car/qc/ProfileSwitcherTest.java b/tests/src/com/android/systemui/car/qc/ProfileSwitcherTest.java
index e433e3a..6c6b8c0 100644
--- a/tests/src/com/android/systemui/car/qc/ProfileSwitcherTest.java
+++ b/tests/src/com/android/systemui/car/qc/ProfileSwitcherTest.java
@@ -106,7 +106,7 @@
when(mUserTracker.getUserHandle()).thenReturn(UserHandle.of(1000));
when(mUserManager.getAliveUsers()).thenReturn(mAliveUsers);
when(mUserManager.getUserSwitchability(any())).thenReturn(SWITCHABILITY_STATUS_OK);
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(false);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(false);
mockUmGetVisibleUsers(mUserManager, 1000);
when(mDevicePolicyManager.isDeviceManaged()).thenReturn(false);
when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(false);
@@ -348,7 +348,7 @@
@Test
public void onUserPressed_alreadyStartedUser_doesNothing() {
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(true);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true);
int currentUserId = 1000;
int secondaryUserId = 1001;
UserInfo user1 = generateUser(currentUserId, "User1", /* supportsSwitch= */ true,
@@ -366,8 +366,7 @@
// Verify nothing happens
verify(mCarUserManager, never()).switchUser(secondaryUserId);
verify(mActivityManager, never()).stopUser(anyInt(), anyBoolean());
- verify(mActivityManager, never()).startUserInBackgroundOnSecondaryDisplay(anyInt(),
- anyInt());
+ verify(mActivityManager, never()).startUserInBackgroundVisibleOnDisplay(anyInt(), anyInt());
}
@Test
@@ -376,7 +375,7 @@
int secondaryUserId = 1001;
int newUserId = 1002;
doReturn(true).when(() -> CarSystemUIUserUtil.isSecondaryMUMDSystemUI(any()));
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(true);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true);
when(mUserTracker.getUserId()).thenReturn(secondaryUserId);
when(mUserTracker.getUserHandle()).thenReturn(UserHandle.of(secondaryUserId));
UserInfo user1 = generateUser(currentUserId, "User1", /* supportsSwitch= */ true,
@@ -395,8 +394,7 @@
QCRow newUserRow = rows.get(2);
newUserRow.getActionHandler().onAction(newUserRow, mContext, new Intent());
verify(mActivityManager).stopUser(eq(secondaryUserId), anyBoolean());
- verify(mActivityManager).startUserInBackgroundOnSecondaryDisplay(eq(newUserId),
- anyInt());
+ verify(mActivityManager).startUserInBackgroundVisibleOnDisplay(eq(newUserId), anyInt());
}
private List<QCRow> getProfileRows() {
diff --git a/tests/src/com/android/systemui/car/users/CarSystemUIUserUtilTest.java b/tests/src/com/android/systemui/car/users/CarSystemUIUserUtilTest.java
index fdbce89..fb6ceec 100644
--- a/tests/src/com/android/systemui/car/users/CarSystemUIUserUtilTest.java
+++ b/tests/src/com/android/systemui/car/users/CarSystemUIUserUtilTest.java
@@ -119,14 +119,14 @@
@Test
public void isSecondaryMUMDSystemUI_usersOnSecondaryDisplaysNotSupported_returnsFalse() {
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(false);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(false);
assertThat(CarSystemUIUserUtil.isSecondaryMUMDSystemUI(mContext)).isFalse();
}
@Test
public void isSecondaryMUMDSystemUI_systemUser_returnsFalse() {
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(true);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true);
when(Process.myUserHandle()).thenReturn(UserHandle.SYSTEM);
assertThat(CarSystemUIUserUtil.isSecondaryMUMDSystemUI(mContext)).isFalse();
@@ -134,7 +134,7 @@
@Test
public void isSecondaryMUMDSystemUI_currentUser_returnsFalse() {
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(true);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true);
when(Process.myUserHandle()).thenReturn(UserHandle.of(mActivityManagerTestUser));
assertThat(CarSystemUIUserUtil.isSecondaryMUMDSystemUI(mContext)).isFalse();
@@ -142,7 +142,7 @@
@Test
public void isSecondaryMUMDSystemUI_isSecondaryUser_returnsTrue() {
- when(mUserManager.isUsersOnSecondaryDisplaysSupported()).thenReturn(true);
+ when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true);
when(Process.myUserHandle()).thenReturn(mUserHandle);
assertThat(CarSystemUIUserUtil.isSecondaryMUMDSystemUI(mContext)).isTrue();
