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

+3 −0

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

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

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

+1 −0

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

+1 −0

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

+3 −1

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

	//		//