Merge "Ensure wm is fetched on the shell thread" into sc-qpr1-dev am: 938b7d01f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15881354

Change-Id: I9a6550abbfb20a183084a80c2c041e34042148f0
This commit is contained in:
Winson Chung
2021-09-22 02:49:35 +00:00
committed by Automerger Merge Worker

View File

@@ -303,13 +303,13 @@ public class PipController implements PipTransitionController.PipTransitionCallb
mOneHandedController = oneHandedController; mOneHandedController = oneHandedController;
mPipTransitionController = pipTransitionController; mPipTransitionController = pipTransitionController;
mTaskStackListener = taskStackListener; mTaskStackListener = taskStackListener;
mPipInputConsumer = new PipInputConsumer(WindowManagerGlobal.getWindowManagerService(),
INPUT_CONSUMER_PIP, mainExecutor);
//TODO: move this to ShellInit when PipController can be injected //TODO: move this to ShellInit when PipController can be injected
mMainExecutor.execute(this::init); mMainExecutor.execute(this::init);
} }
public void init() { public void init() {
mPipInputConsumer = new PipInputConsumer(WindowManagerGlobal.getWindowManagerService(),
INPUT_CONSUMER_PIP, mMainExecutor);
mPipTransitionController.registerPipTransitionCallback(this); mPipTransitionController.registerPipTransitionCallback(this);
mPipTaskOrganizer.registerOnDisplayIdChangeCallback((int displayId) -> { mPipTaskOrganizer.registerOnDisplayIdChangeCallback((int displayId) -> {
mPipBoundsState.setDisplayId(displayId); mPipBoundsState.setDisplayId(displayId);