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

Commit 0fa593d7 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:... 

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

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

Change-Id: I78bd3aad3da89ffd518de7151a5b35cfa6f25f2c
parents 0553d775 db583952

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

+2 −2
Original line number Diff line number Diff line
@@ -315,13 +315,13 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        mOneHandedController = oneHandedController;

        mPipTransitionController = pipTransitionController;

        mTaskStackListener = taskStackListener;

        mPipInputConsumer = new PipInputConsumer(WindowManagerGlobal.getWindowManagerService(),

                INPUT_CONSUMER_PIP, mainExecutor);

        //TODO: move this to ShellInit when PipController can be injected

        mMainExecutor.execute(this::init);

    }



    public void init() {

        mPipInputConsumer = new PipInputConsumer(WindowManagerGlobal.getWindowManagerService(),

                INPUT_CONSUMER_PIP, mMainExecutor);

        mPipTransitionController.registerPipTransitionCallback(this);

        mPipTaskOrganizer.registerOnDisplayIdChangeCallback((int displayId) -> {

            mPipBoundsState.setDisplayId(displayId);