Merge "Add null check for default proximity sensor." into rvc-d1-dev

2020-05-06 18:21:17 +00:00
parent 62adb8e421 67a07c2223
commit a994e405bd
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/util/sensors/SensorModule.java
+++ b/packages/SystemUI/src/com/android/systemui/util/sensors/SensorModule.java
@@ -44,7 +44,7 @@ public class SensorModule {
            Sensor defaultSensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
            return thresholdSensorBuilder
                    .setSensor(defaultSensor)
-                    .setThresholdValue(defaultSensor.getMaximumRange())
+                    .setThresholdValue(defaultSensor != null ? defaultSensor.getMaximumRange() : 0)
                    .build();
        }
    }