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

Merge "InputManagerService: Do not remove input channel when disposing monitor" into sc-dev am: 2f13cca5a6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405649

Change-Id: Id4b3d10a1f5b8837621c1252f67e101c449a9e01
This commit is contained in:
Prabir Pradhan
2021-07-30 00:47:48 +00:00
committed by Automerger Merge Worker
parent 3f47f90e0c 2f13cca5a6
commit dba3350087
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -3230,7 +3230,7 @@ public class InputManagerService extends IInputManager.Stub
* Interface for the system to handle request from InputMonitors. * Interface for the system to handle request from InputMonitors.
*/ */
private final class InputMonitorHost extends IInputMonitorHost.Stub { private final class InputMonitorHost extends IInputMonitorHost.Stub {
private final IBinder mToken; private IBinder mToken;
InputMonitorHost(IBinder token) { InputMonitorHost(IBinder token) {
mToken = token; mToken = token;
@@ -3238,12 +3238,23 @@ public class InputManagerService extends IInputManager.Stub
@Override @Override
public void pilferPointers() { public void pilferPointers() {
if (mToken == null) {
throw new IllegalStateException(
"Illegal call to pilferPointers after InputMonitorHost is disposed.");
}
nativePilferPointers(mPtr, mToken); nativePilferPointers(mPtr, mToken);
} }
@Override @Override
public void dispose() { public void dispose() {
nativeRemoveInputChannel(mPtr, mToken); // We do not remove the input monitor here by calling nativeRemoveInputChannel because
// it causes a race in InputDispatcher between the removal of the InputChannel through
// that call and the InputChannel#dispose call (which causes an FD hangup) from the
// client (b/189135695).
//
// NOTE: This means the client is responsible for properly closing the InputMonitor by
// disposing the InputChannel and all its duplicates.
mToken = null;
} }
} }