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

Change-Id: I1e92c7638cb16445862d0ab5140ea127a6cf5034
2020-05-06 18:42:14 +00:00
parent 5096d6d0be a994e405bd
commit 58654ea7bd
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();
        }
    }