Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow No Sensor to be Specified in DDC"

Browse Source
This commit is contained in:
Fiona Campbell
2022-12-02 13:29:23 +00:00
committed by Android (Google) Code Review
parent 213e7ff1d0 a608da9dfd
commit fa648d660a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DisplayDeviceConfig.java
View File

@@ -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) {

3
services/core/java/com/android/server/display/utils/SensorUtils.java
View File

@@ -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) {