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

Commit b3460853 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "NPE in isTrackpadDevice" into udc-qpr-dev am: 98dd22fd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23555608



Change-Id: I770eb28896f0030084039feea5d015b8719b3518
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 662d85b2 98dd22fd

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

    }