Merge "Fix crash from isTrackpadDevice" into main

2024-06-11 21:22:35 +00:00
parent 27471df69c 1deac6777b
commit 16b2656ecf
1 changed files with 3 additions and 0 deletions
@@ -510,6 +510,9 @@ public class TouchInteractionService extends Service {

                private boolean isTrackpadDevice(int deviceId) {
                    InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
+                    if (inputDevice == null) {
+                        return false;
+                    }
                    return inputDevice.getSources() == (InputDevice.SOURCE_MOUSE
                            | InputDevice.SOURCE_TOUCHPAD);
                }