Merge "Remove the user assignment to the current user for the overlay display in ExtraDisplayMonitor." into main
diff --git a/builtInServices/Android.bp b/builtInServices/Android.bp
index 046f048..d6ed2e4 100644
--- a/builtInServices/Android.bp
+++ b/builtInServices/Android.bp
@@ -8,7 +8,7 @@
libs: [
"services",
"android.car",
- "android.car.builtin", // Will remove once split is complete
+ "android.car.builtin.stubs.module_lib", // Will remove once split is complete
"android.hardware.automotive.vehicle-V2.0-java",
],
srcs: [
diff --git a/updatableServices/tests/src/com/android/server/wm/CarLaunchParamsModifierUpdatableTest.java b/updatableServices/tests/src/com/android/server/wm/CarLaunchParamsModifierUpdatableTest.java
index 38418a5..511d747 100644
--- a/updatableServices/tests/src/com/android/server/wm/CarLaunchParamsModifierUpdatableTest.java
+++ b/updatableServices/tests/src/com/android/server/wm/CarLaunchParamsModifierUpdatableTest.java
@@ -120,6 +120,8 @@
private InputManagerService mInputManagerService;
@Mock
private UserManagerInternal mUserManagerInternal;
+ @Mock
+ private AppCompatConfiguration mAppCompatConfiguration;
@Mock
private Display mDisplay0ForDriver;
@@ -213,7 +215,8 @@
mContext, mInputManagerService, /* showBootMsgs= */ false, /* policy= */ null,
mActivityTaskManagerService,
/* displayWindowSettingsProvider= */ null, () -> new SurfaceControl.Transaction(),
- /* surfaceControlFactory= */ null);
+ /* surfaceControlFactory= */ null,
+ /* appCompatConfiguration= */ mAppCompatConfiguration);
mActivityTaskManagerService.mWindowManager = mWindowManagerService;
mRootWindowContainer.mWindowManager = mWindowManagerService;
