From 1deac6777b169dce21745a1e407ec9956cf3e4cc Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Tue, 11 Jun 2024 10:40:17 -0700 Subject: [PATCH] Fix crash from isTrackpadDevice Apparently InputManager.getInputDevice can return null when a device is added Fixes: 344902395 Test: N/A Change-Id: I79c3dd3431b1d4b079b8a6863688a13ea2741602 --- .../src/com/android/quickstep/TouchInteractionService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 58bb8fc7c4..e10b56de69 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -512,6 +512,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); }