PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move initInputMonitor to the main thread

Browse Source 
- Stuff related to updating internal TIS state need to also run on the
  main thread

Bug: 374197142
Flag: EXEMPT bugfix
Test: Presubmit
Change-Id: Ia62b665d9a39bc4a4c119fce8538bb147d92957a
This commit is contained in:
Tracy Zhou
2024-11-07 13:20:48 -08:00
parent b7666bd2f0
commit 9d072a5e5c
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TouchInteractionService.java
+20 -9
View File
@@ -74,6 +74,7 @@ import android.view.MotionEvent;
import android.view.View;
import androidx.annotation.BinderThread;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@@ -550,11 +551,15 @@ public class TouchInteractionService extends Service {
@Override
public void onInputDeviceAdded(int deviceId) {
if (isTrackpadDevice(deviceId)) {
boolean wasEmpty = mTrackpadsConnected.isEmpty();
mTrackpadsConnected.add(deviceId);
if (wasEmpty) {
update();
}
// This updates internal TIS state so it needs to also run on the main
// thread.
MAIN_EXECUTOR.execute(() -> {
boolean wasEmpty = mTrackpadsConnected.isEmpty();
mTrackpadsConnected.add(deviceId);
if (wasEmpty) {
update();
}
});
}
}
@@ -564,12 +569,17 @@ public class TouchInteractionService extends Service {
@Override
public void onInputDeviceRemoved(int deviceId) {
mTrackpadsConnected.remove(deviceId);
if (mTrackpadsConnected.isEmpty()) {
update();
}
// This updates internal TIS state so it needs to also run on the main
// thread.
MAIN_EXECUTOR.execute(() -> {
mTrackpadsConnected.remove(deviceId);
if (mTrackpadsConnected.isEmpty()) {
update();
}
});
}
@MainThread
private void update() {
if (mInputMonitorCompat != null && !mTrackpadsConnected.isEmpty()) {
// Don't destroy and reinitialize input monitor due to trackpad
@@ -580,6 +590,7 @@ public class TouchInteractionService extends Service {
}
private boolean isTrackpadDevice(int deviceId) {
// This is a blocking binder call that should run on a bg thread.
InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
if (inputDevice == null) {
return false;