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

Commit 94bba027 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents eccc9236 8970010a

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);