Fix unguarded use of Lollipop API

This commit is contained in:
Cameron Gutman 2023-09-16 22:53:13 -05:00
parent cafc4450b2
commit d32c4f86a7

View File

@ -2077,7 +2077,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
}
// Enable the accelerometer if requested
Sensor accelSensor = sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER, false);
Sensor accelSensor = sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
if (reportRateHz != 0 && accelSensor != null) {
deviceContext.accelListener = createSensorListener(controllerNumber, motionType, sm == deviceSensorManager);
sm.registerListener(deviceContext.accelListener, accelSensor, 1000000 / reportRateHz);
@ -2094,7 +2094,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
}
// Enable the gyroscope if requested
Sensor gyroSensor = sm.getDefaultSensor(Sensor.TYPE_GYROSCOPE, false);
Sensor gyroSensor = sm.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
if (reportRateHz != 0 && gyroSensor != null) {
deviceContext.gyroListener = createSensorListener(controllerNumber, motionType, sm == deviceSensorManager);
sm.registerListener(deviceContext.gyroListener, gyroSensor, 1000000 / reportRateHz);