From 6306169f866402321c9d832834c6aa3f552380c8 Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Wed, 12 May 2021 13:34:13 +0100
Subject: [PATCH] Add fallback for sensor identification in ddc

If a display device config was specified but without a valid ambient light sensor, it would fall back to Sensor.TYPE_LIGHT rather than the specified one in config.xml. This change fixes that.

Bug: 187130675
Test: adb shell dumpsys display | grep DisplayDeviceConfig
Test: com.android.server.display
Change-Id: I5b3f71a7c32055dbbd43d8fd139cfa7d09b9b3c4
---
 .../java/com/android/server/display/DisplayDeviceConfig.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
index 0f9e604651e85..314955b4ed4b6 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
@@ -689,6 +689,8 @@ public class DisplayDeviceConfig {
         if (sensorDetails != null) {
             mAmbientLightSensor.type = sensorDetails.getType();
             mAmbientLightSensor.name = sensorDetails.getName();
+        } else {
+            loadAmbientLightSensorFromConfigXml();
         }
     }