Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ce4fb60 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5c5c6f45eeab257d8cc17b1e9321fa51f4893132
parents f3be4346 938b7d01

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -315,13 +315,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);