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

2020-04-20 23:47:24 +00:00
parent afe3e11c65 e57724d7fc
commit 4c696cce14
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -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);
            }
        }
    }