DO NOT MERGE Set the sensor threshold only if sensor exists

Bug: 150779130 Test: atest SystemUITests and manual test for automotive Change-Id: I18e3584c66f1286713a6fdadc678a9048869913b
2020-03-04 12:19:37 -08:00
parent 8af68ccfb5
commit 06a7bf9e9e
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
@@ -305,7 +305,7 @@ public class DozeSensors {
                        mContext.getResources());
            } else {
                sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
-                mSensorThreshold = sensor.getMaximumRange();
+                mSensorThreshold = sensor == null ? 0 : sensor.getMaximumRange();
            }
            mSensor = sensor;
        }