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

Change-Id: I30406c1f5bc2bea7ad6a6af81c8fc7130de37b39

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