Snap for 12224018 from c0bb480178e2765242c34dc0aa333d03ae325598 to 24Q4-release
Change-Id: Ia30f1b9bddcadb430cbdcc766e9fe5e02156f67a
diff --git a/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java b/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
index cbb637a..a6a38da 100644
--- a/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
+++ b/updatableServices/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImpl.java
@@ -397,6 +397,16 @@
}
@Override
+ public boolean assignUserToExtraDisplay(int userId, int displayId) {
+ return mCarServiceHelperInterface.assignUserToExtraDisplay(userId, displayId);
+ }
+
+ @Override
+ public boolean unassignUserFromExtraDisplay(int userId, int displayId) {
+ return mCarServiceHelperInterface.unassignUserFromExtraDisplay(userId, displayId);
+ }
+
+ @Override
public boolean startUserInBackgroundVisibleOnDisplay(int userId, int displayId) {
return mCarServiceHelperInterface.startUserInBackgroundVisibleOnDisplay(
userId, displayId);
diff --git a/updatableServices/tests/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImplTest.java b/updatableServices/tests/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImplTest.java
index 6076bed..a9a0291 100644
--- a/updatableServices/tests/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImplTest.java
+++ b/updatableServices/tests/src/com/android/internal/car/updatable/CarServiceHelperServiceUpdatableImplTest.java
@@ -220,6 +220,24 @@
.isEqualTo(108);
}
+ @Test
+ public void testAssignUserToExtraDisplay() throws Exception {
+ int userId = 42;
+ int displayId = 37;
+ mCarServiceHelperInterface.assignUserToExtraDisplay(userId, displayId);
+
+ verify(mCarServiceHelperInterface).assignUserToExtraDisplay(userId, displayId);
+ }
+
+ @Test
+ public void testUnassignUserToExtraDisplay() throws Exception {
+ int userId = 42;
+ int displayId = 37;
+ mCarServiceHelperInterface.unassignUserFromExtraDisplay(userId, displayId);
+
+ verify(mCarServiceHelperInterface).unassignUserFromExtraDisplay(userId, displayId);
+ }
+
private void mockICarBinder() {
when(ICar.Stub.asInterface(mIBinder)).thenReturn(mICarBinder);
}
