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 am: 4c696cce14 am: c7f150ea92

Browse Source 
Change-Id: Id2e0fa9a8902b82499af0c25c5ceb0abf14049e3
This commit is contained in:
TreeHugger Robot
2020-04-21 11:05:08 +00:00
committed by Automerger Merge Worker
parent a27a8f2ef6 c7f150ea92
commit b3ba0f3ca1
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()) {
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);
}
}
}