From 1cd7bd3db64fbad8f92e2f8fffab486695476cd4 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Sat, 3 Jun 2023 13:04:30 -0700
Subject: [PATCH] NPE in isTrackpadDevice

Bug: 285628328
Test: atest inputflinger_tests
Change-Id: I136ee119fdd85cbdcd37f48c42f421f67f5f9e9d
---
 .../navigationbar/gestural/EdgeBackGestureHandler.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index cb8d87a2e6203..22679c7d2bddc 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -885,6 +885,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
 
     private boolean isTrackpadDevice(int deviceId) {
         InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
+        if (inputDevice == null) {
+            return false;
+        }
         return inputDevice.getSources() == (InputDevice.SOURCE_MOUSE
                 | InputDevice.SOURCE_TOUCHPAD);
     }