From 67a07c2223bcad0073a8c953f9d54a96a7dbf9f3 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Thu, 30 Apr 2020 18:12:39 -0700
Subject: [PATCH] Add null check for default proximity sensor.

Without this we fail to boot on devices without a proximity sensor,
such as FVP.

Bug: 142352330
Change-Id: I474628d7ba32a9178fd720563fe2eca177920203
Merged-In: I474628d7ba32a9178fd720563fe2eca177920203
---
 .../src/com/android/systemui/util/sensors/SensorModule.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/util/sensors/SensorModule.java b/packages/SystemUI/src/com/android/systemui/util/sensors/SensorModule.java
index c5a658f298dca..7f37562446294 100644
--- 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();
         }
     }