diff options
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayDeviceConfig.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/utils/SensorUtils.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 523a2dca7a18..c1e9526a9127 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -1941,8 +1941,8 @@ public class DisplayDeviceConfig { } private void setProxSensorUnspecified() { - mProximitySensor.name = ""; - mProximitySensor.type = ""; + mProximitySensor.name = null; + mProximitySensor.type = null; } private void loadProxSensorFromDdc(DisplayConfiguration config) { diff --git a/services/core/java/com/android/server/display/utils/SensorUtils.java b/services/core/java/com/android/server/display/utils/SensorUtils.java index cb40b406899f..4924ad525fcc 100644 --- a/services/core/java/com/android/server/display/utils/SensorUtils.java +++ b/services/core/java/com/android/server/display/utils/SensorUtils.java @@ -33,6 +33,9 @@ public class SensorUtils { */ public static Sensor findSensor(SensorManager sensorManager, String sensorType, String sensorName, int fallbackType) { + if ("".equals(sensorName) && "".equals(sensorType)) { + return null; + } final boolean isNameSpecified = !TextUtils.isEmpty(sensorName); final boolean isTypeSpecified = !TextUtils.isEmpty(sensorType); if (isNameSpecified || isTypeSpecified) { |