Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3fe419 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Gerrit Code Review
Browse files

Merge "Fix NPE in TouchpadDebugViewController" into main

parents 42a0e321 c2282c01

services/core/java/com/android/server/input/debug/TouchpadDebugViewController.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -55,15 +55,17 @@ public class TouchpadDebugViewController implements InputManager.InputDeviceList 




    @Override

    @Override

    public void onInputDeviceAdded(int deviceId) {

    public void onInputDeviceAdded(int deviceId) {

        if (!mTouchpadVisualizerEnabled) {

            return;

        }

        final InputManager inputManager = Objects.requireNonNull(

        final InputManager inputManager = Objects.requireNonNull(

                mContext.getSystemService(InputManager.class));

                mContext.getSystemService(InputManager.class));

        InputDevice inputDevice = inputManager.getInputDevice(deviceId);

        InputDevice inputDevice = inputManager.getInputDevice(deviceId);



        if (inputDevice == null || !inputDevice.supportsSource(

        if (Objects.requireNonNull(inputDevice).supportsSource(

                InputDevice.SOURCE_TOUCHPAD | InputDevice.SOURCE_MOUSE)) {

                InputDevice.SOURCE_TOUCHPAD | InputDevice.SOURCE_MOUSE)

            return;

                && mTouchpadVisualizerEnabled) {

            showDebugView(deviceId);

        }

        }

        showDebugView(deviceId);

    }

    }





    @Override

    @Override