Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-20 23:47:24 +00:00
committed by Android (Google) Code Review
parent afe3e11c65 e57724d7fc
commit 4c696cce14
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -487,7 +487,8 @@ final class InputMonitor {
|| w.cantReceiveTouchInput()) { || w.cantReceiveTouchInput()) {
if (w.mWinAnimator.hasSurface()) { if (w.mWinAnimator.hasSurface()) {
mInputTransaction.setInputWindowInfo( mInputTransaction.setInputWindowInfo(
w.mWinAnimator.mSurfaceController.mSurfaceControl, mInvalidInputWindow); w.mWinAnimator.mSurfaceController.getClientViewRootSurface(),
mInvalidInputWindow);
} }
// Skip this window because it cannot possibly receive input. // Skip this window because it cannot possibly receive input.
return; return;
@@ -560,7 +561,8 @@ final class InputMonitor {
if (w.mWinAnimator.hasSurface()) { if (w.mWinAnimator.hasSurface()) {
mInputTransaction.setInputWindowInfo( mInputTransaction.setInputWindowInfo(
w.mWinAnimator.mSurfaceController.mSurfaceControl, inputWindowHandle); w.mWinAnimator.mSurfaceController.getClientViewRootSurface(),
inputWindowHandle);
} }
} }
} }