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

Commit 3e607fd4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "InputMonitor: Ensure we assign input to correct Surface" into rvc-dev am: 4c696cce 

Change-Id: I0ecc875ce3965a97ffa53718aedf9a326266f6e8
parents be01ff1e 4c696cce

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);

            }

        }

    }