Merge "DO NOT MERGE Set the sensor threshold only if sensor exists" into qt-qpr1-dev

2020-03-06 22:15:42 +00:00
parent 1756b8ec84 06a7bf9e9e
commit 140cf2c729
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;
        }