Merge "Update UserTracker.Callback after registering it" into main (3a6a5c9d) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -242,6 +242,7 @@ class BubbleControllerBubbleBarTest {
		shellInit,
		shellCommandHandler,
		mock<DisplayInsetsController>(),
		mock<UserManager>(),
		mainExecutor,
		)
		val surfaceSynchronizer = { obj: Runnable -> obj.run() }

+3 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ class BubbleControllerTest {
		private lateinit var displayController: DisplayController
		private lateinit var displayImeController: DisplayImeController
		private lateinit var displayInsetsController: DisplayInsetsController
		private lateinit var userManager: UserManager
		private lateinit var imeListener: ImeListener

		@Before
		@@ -128,6 +129,7 @@ class BubbleControllerTest {
		displayController = mock<DisplayController>()
		displayImeController = mock<DisplayImeController>()
		displayInsetsController = mock<DisplayInsetsController>()
		userManager = mock<UserManager>()

		bubbleController =
		createBubbleController(
		@@ -328,6 +330,7 @@ class BubbleControllerTest {
		shellInit,
		shellCommandHandler,
		displayInsetsController,
		userManager,
		mainExecutor,
		)
		val surfaceSynchronizer = { obj: Runnable -> obj.run() }

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ class BubbleViewInfoTaskTest {
		shellInit,
		shellCommandHandler,
		mock<DisplayInsetsController>(),
		mock<UserManager>(),
		mainExecutor
		)
		bubblePositioner = BubblePositioner(context, windowManager)

+1 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ class BubbleBarLayerViewTest {
		shellInit,
		shellCommandHandler,
		mock<DisplayInsetsController>(),
		mock<UserManager>(),
		mainExecutor,
		)
		val surfaceSynchronizer = { obj: Runnable -> obj.run() }

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.content.pm.PackageManager;
		import android.hardware.display.DisplayManager;
		import android.os.Handler;
		import android.os.SystemProperties;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.view.IWindowManager;
		import android.view.accessibility.AccessibilityManager;
		@@ -1010,9 +1011,10 @@ public abstract class WMShellBaseModule {
		ShellInit shellInit,
		ShellCommandHandler shellCommandHandler,
		DisplayInsetsController displayInsetsController,
		UserManager userManager,
		@ShellMainThread ShellExecutor mainExecutor) {
		return new ShellController(context, shellInit, shellCommandHandler,
		displayInsetsController, mainExecutor);
		displayInsetsController, userManager, mainExecutor);
		}

		//