From 06a7bf9e9e1ae1b6b5a162fa664ad5ed5670ad74 Mon Sep 17 00:00:00 2001
From: Heemin Seog <hseog@google.com>
Date: Wed, 4 Mar 2020 12:19:37 -0800
Subject: [PATCH] DO NOT MERGE Set the sensor threshold only if sensor exists

Bug: 150779130
Test: atest SystemUITests and manual test for automotive
Change-Id: I18e3584c66f1286713a6fdadc678a9048869913b
---
 .../SystemUI/src/com/android/systemui/doze/DozeSensors.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
index b7c8f707b8506..e6cbab26c6551 100644
--- 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;
         }