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

Commit e57724d7 authored by Robert Carr's avatar Robert Carr
Browse files

InputMonitor: Ensure we assign input to correct Surface 

We want to assign input to the BLAST surface instead of the
WSA container layer if BLAST is enabled. Previously this didn't
matter but following upcoming occlusion changes the BLAST surface
would then occlude the WSA surface and the main Input Channel would
fail to receive input. We fix this by having InputMonitor call
getClientViewRootSurface()

Bug: 152064592
Test: Flip BLAST. Input still works!
Change-Id: I3e4e136fa11d15f8f576b97dbdc34c9a585a0f32
parent adf530fc

services/core/java/com/android/server/wm/InputMonitor.java

+4 −2
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ final class InputMonitor { 
                    || w.cantReceiveTouchInput()) {

                if (w.mWinAnimator.hasSurface()) {

                    mInputTransaction.setInputWindowInfo(

                            w.mWinAnimator.mSurfaceController.mSurfaceControl, mInvalidInputWindow);

                        w.mWinAnimator.mSurfaceController.getClientViewRootSurface(),

                        mInvalidInputWindow);

                }

                // Skip this window because it cannot possibly receive input.

                return;
@@ -560,7 +561,8 @@ final class InputMonitor { 


            if (w.mWinAnimator.hasSurface()) {

                mInputTransaction.setInputWindowInfo(

                        w.mWinAnimator.mSurfaceController.mSurfaceControl, inputWindowHandle);

                    w.mWinAnimator.mSurfaceController.getClientViewRootSurface(),

                    inputWindowHandle);

            }

        }

    }