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

Commit c110d59a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check that InputDevice isn't null and add annotations" into tm-dev am: 94bba027 

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



Change-Id: I363028653e20dd85cc62702bb6677731ab392ce4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38ea4274 94bba027

core/java/android/hardware/input/InputDeviceSensorManager.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class InputDeviceSensorManager implements InputManager.InputDeviceListene 
     */

    private void updateInputDeviceSensorInfoLocked(int deviceId) {

        final InputDevice inputDevice = InputDevice.getDevice(deviceId);

        if (inputDevice.hasSensor()) {

        if (inputDevice != null && inputDevice.hasSensor()) {

            final InputSensorInfo[] sensorInfos =

                    mInputManager.getSensorList(deviceId);

            populateSensorsForInputDeviceLocked(deviceId, sensorInfos);