Merge "Fix NPE in TouchpadDebugViewController" into main

1 files changed, 7 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/input/debug/TouchpadDebugViewController.java b/services/core/java/com/android/server/input/debug/TouchpadDebugViewController.java
index 9cfbfa649e1c..e36bcd8858df 100644
--- a/services/core/java/com/android/server/input/debug/TouchpadDebugViewController.java
+++ b/services/core/java/com/android/server/input/debug/TouchpadDebugViewController.java
@@ -55,15 +55,17 @@ public class TouchpadDebugViewController implements InputManager.InputDeviceList
 
     @Override
     public void onInputDeviceAdded(int deviceId) {
+        if (!mTouchpadVisualizerEnabled) {
+            return;
+        }
         final InputManager inputManager = Objects.requireNonNull(
                 mContext.getSystemService(InputManager.class));
         InputDevice inputDevice = inputManager.getInputDevice(deviceId);
-
-        if (Objects.requireNonNull(inputDevice).supportsSource(
-                InputDevice.SOURCE_TOUCHPAD | InputDevice.SOURCE_MOUSE)
-                && mTouchpadVisualizerEnabled) {
-            showDebugView(deviceId);
+        if (inputDevice == null || !inputDevice.supportsSource(
+                InputDevice.SOURCE_TOUCHPAD | InputDevice.SOURCE_MOUSE)) {
+            return;
         }
+        showDebugView(deviceId);
     }
 
     @Override