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

Merge "Only update native InputApplicationHandle once" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-17 03:35:16 +00:00
committed by Android (Google) Code Review
parent fd71d25ea5 c26a04ce1a
commit 82f859838f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import android.os.Trace;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.Slog;
import android.view.InputApplicationHandle;
import android.view.InputChannel;
import android.view.InputEventReceiver;
import android.view.InputWindowHandle;

4
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -943,8 +943,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mLastRequestedHeight = 0;
mLayer = 0;
mInputWindowHandle = new InputWindowHandle(
mActivityRecord != null ?
mActivityRecord.getInputApplicationHandle(false /* update */) : null,
mActivityRecord != null
? mActivityRecord.getInputApplicationHandle(false /* update */) : null,
getDisplayId());
// Make sure we initial all fields before adding to parentWindow, to prevent exception