Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa648d66 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Allow No Sensor to be Specified in DDC"

parents 213e7ff1 a608da9d

services/core/java/com/android/server/display/DisplayDeviceConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {

services/core/java/com/android/server/display/utils/SensorUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -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) {