commit 1deac6777b169dce21745a1e407ec9956cf3e4cc
author Tracy Zhou <tracyzhou@google.com> Tue Jun 11 10:40:17 2024 -0700
committer Tracy Zhou <tracyzhou@google.com> Tue Jun 11 10:40:17 2024 -0700
tree fe275a6311bd655f13394eb8b3fed19edebf3c67
parent 38b9e1438efa7cbfaceb1c83042f39bacd200aef

Fix crash from isTrackpadDevice

Apparently InputManager.getInputDevice can return null when a device is added

Fixes: 344902395
Test: N/A
Change-Id: I79c3dd3431b1d4b079b8a6863688a13ea2741602

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 58bb8fc..e10b56d 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -512,6 +512,9 @@
 
                 private boolean isTrackpadDevice(int deviceId) {
                     InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
+                    if (inputDevice == null) {
+                        return false;
+                    }
                     return inputDevice.getSources() == (InputDevice.SOURCE_MOUSE
                             | InputDevice.SOURCE_TOUCHPAD);
                 }