Merge "Add shell background executor to bubbles and put unregister call on it" (3fa9d7ed) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.common.TaskStackListenerCallback;
		import com.android.wm.shell.common.TaskStackListenerImpl;
		import com.android.wm.shell.common.annotations.ShellBackgroundThread;
		import com.android.wm.shell.common.annotations.ShellMainThread;
		import com.android.wm.shell.draganddrop.DragAndDropController;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.onehanded.OneHandedTransitionCallback;
		@@ -156,6 +158,8 @@ public class BubbleController {
		private final ShellExecutor mMainExecutor;
		private final Handler mMainHandler;

		private final ShellExecutor mBackgroundExecutor;

		private BubbleLogger mLogger;
		private BubbleData mBubbleData;
		@Nullable private BubbleStackView mStackView;
		@@ -232,8 +236,9 @@ public class BubbleController {
		DisplayController displayController,
		Optional<OneHandedController> oneHandedOptional,
		DragAndDropController dragAndDropController,
		ShellExecutor mainExecutor,
		Handler mainHandler,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler,
		@ShellBackgroundThread ShellExecutor bgExecutor,
		TaskViewTransitions taskViewTransitions,
		SyncTransactionQueue syncQueue) {
		BubbleLogger logger = new BubbleLogger(uiEventLogger);
		@@ -243,7 +248,7 @@ public class BubbleController {
		new BubbleDataRepository(context, launcherApps, mainExecutor),
		statusBarService, windowManager, windowManagerShellWrapper, launcherApps,
		logger, taskStackListener, organizer, positioner, displayController,
		oneHandedOptional, dragAndDropController, mainExecutor, mainHandler,
		oneHandedOptional, dragAndDropController, mainExecutor, mainHandler, bgExecutor,
		taskViewTransitions, syncQueue);
		}

		@@ -267,8 +272,9 @@ public class BubbleController {
		DisplayController displayController,
		Optional<OneHandedController> oneHandedOptional,
		DragAndDropController dragAndDropController,
		ShellExecutor mainExecutor,
		Handler mainHandler,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler,
		@ShellBackgroundThread ShellExecutor bgExecutor,
		TaskViewTransitions taskViewTransitions,
		SyncTransactionQueue syncQueue) {
		mContext = context;
		@@ -284,6 +290,7 @@ public class BubbleController {
		mLogger = bubbleLogger;
		mMainExecutor = mainExecutor;
		mMainHandler = mainHandler;
		mBackgroundExecutor = bgExecutor;
		mTaskStackListener = taskStackListener;
		mTaskOrganizer = organizer;
		mSurfaceSynchronizer = synchronizer;
		@@ -719,7 +726,8 @@ public class BubbleController {

		try {
		mAddedToWindowManager = false;
		mContext.unregisterReceiver(mBroadcastReceiver);
		// Put on background for this binder call, was causing jank
		mBackgroundExecutor.execute(() -> mContext.unregisterReceiver(mBroadcastReceiver));
		if (mStackView != null) {
		mWindowManager.removeView(mStackView);
		mBubbleData.getOverflow().cleanUpExpandedState();

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.common.SystemWindows;
		import com.android.wm.shell.common.TaskStackListenerImpl;
		import com.android.wm.shell.common.TransactionPool;
		import com.android.wm.shell.common.annotations.ShellBackgroundThread;
		import com.android.wm.shell.common.annotations.ShellMainThread;
		import com.android.wm.shell.draganddrop.DragAndDropController;
		import com.android.wm.shell.freeform.FreeformTaskListener;
		@@ -112,13 +113,15 @@ public class WMShellModule {
		DragAndDropController dragAndDropController,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler,
		@ShellBackgroundThread ShellExecutor bgExecutor,
		TaskViewTransitions taskViewTransitions,
		SyncTransactionQueue syncQueue) {
		return BubbleController.create(context, null /* synchronizer */,
		floatingContentCoordinator, statusBarService, windowManager,
		windowManagerShellWrapper, launcherApps, taskStackListener,
		uiEventLogger, organizer, displayController, oneHandedOptional,
		dragAndDropController, mainExecutor, mainHandler, taskViewTransitions, syncQueue);
		dragAndDropController, mainExecutor, mainHandler, bgExecutor,
		taskViewTransitions, syncQueue);
		}

		//

packages/SystemUI/tests/src/com/android/systemui/wmshell/TestableBubbleController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class TestableBubbleController extends BubbleController {
		statusBarService, windowManager, windowManagerShellWrapper, launcherApps,
		bubbleLogger, taskStackListener, shellTaskOrganizer, positioner, displayController,
		oneHandedOptional, dragAndDropController, shellMainExecutor, shellMainHandler,
		taskViewTransitions, syncQueue);
		new SyncExecutor(), taskViewTransitions, syncQueue);
		setInflateSynchronously(true);
		initialize();
		}