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

Commit 91a8a689 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b/273689055" into udc-qpr-dev 

* changes:
  Proximity sensor can be null, handling this case properly for DMS
  Revert "Revert "No sensors support in DDC rework""
parents 6e475ff8 f7d8c79b

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

+27 −19
Original line number Diff line number Diff line
@@ -515,7 +515,9 @@ public class DisplayDeviceConfig { 
    private final SensorData mScreenOffBrightnessSensor = new SensorData();



    // The details of the proximity sensor associated with this display.

    private final SensorData mProximitySensor = new SensorData();

    // Is null when no sensor should be used for that display

    @Nullable

    private SensorData mProximitySensor = new SensorData();



    private final List<RefreshRateLimitation> mRefreshRateLimitations =

            new ArrayList<>(2 /*initialCapacity*/);
@@ -1337,7 +1339,8 @@ public class DisplayDeviceConfig { 
        return mScreenOffBrightnessSensor;

    }



    SensorData getProximitySensor() {

    @Nullable

    public SensorData getProximitySensor() {

        return mProximitySensor;

    }
@@ -2563,46 +2566,51 @@ public class DisplayDeviceConfig { 
    private void loadAmbientLightSensorFromDdc(DisplayConfiguration config) {

        final SensorDetails sensorDetails = config.getLightSensor();

        if (sensorDetails != null) {

            mAmbientLightSensor.type = sensorDetails.getType();

            mAmbientLightSensor.name = sensorDetails.getName();

            final RefreshRateRange rr = sensorDetails.getRefreshRate();

            if (rr != null) {

                mAmbientLightSensor.minRefreshRate = rr.getMinimum().floatValue();

                mAmbientLightSensor.maxRefreshRate = rr.getMaximum().floatValue();

            }

            loadSensorData(sensorDetails, mAmbientLightSensor);

        } else {

            loadAmbientLightSensorFromConfigXml();

        }

    }



    private void setProxSensorUnspecified() {

        mProximitySensor.name = null;

        mProximitySensor.type = null;

        mProximitySensor = new SensorData();

    }



    private void loadScreenOffBrightnessSensorFromDdc(DisplayConfiguration config) {

        final SensorDetails sensorDetails = config.getScreenOffBrightnessSensor();

        if (sensorDetails != null) {

            mScreenOffBrightnessSensor.type = sensorDetails.getType();

            mScreenOffBrightnessSensor.name = sensorDetails.getName();

            loadSensorData(sensorDetails, mScreenOffBrightnessSensor);

        }

    }



    private void loadProxSensorFromDdc(DisplayConfiguration config) {

        SensorDetails sensorDetails = config.getProxSensor();

        if (sensorDetails != null) {

            mProximitySensor.name = sensorDetails.getName();

            mProximitySensor.type = sensorDetails.getType();

            final RefreshRateRange rr = sensorDetails.getRefreshRate();

            if (rr != null) {

                mProximitySensor.minRefreshRate = rr.getMinimum().floatValue();

                mProximitySensor.maxRefreshRate = rr.getMaximum().floatValue();

            String name = sensorDetails.getName();

            String type = sensorDetails.getType();

            if ("".equals(name) && "".equals(type)) {

                // <proxSensor> with empty values to the config means no sensor should be used

                mProximitySensor = null;

            } else {

                mProximitySensor = new SensorData();

                loadSensorData(sensorDetails, mProximitySensor);

            }

        } else {

            setProxSensorUnspecified();

        }

    }



    private void loadSensorData(@NonNull SensorDetails sensorDetails,

            @NonNull SensorData sensorData) {

        sensorData.name = sensorDetails.getName();

        sensorData.type = sensorDetails.getType();

        final RefreshRateRange rr = sensorDetails.getRefreshRate();

        if (rr != null) {

            sensorData.minRefreshRate = rr.getMinimum().floatValue();

            sensorData.maxRefreshRate = rr.getMaximum().floatValue();

        }

    }



    private void loadBrightnessChangeThresholdsFromXml() {

        loadBrightnessChangeThresholds(/* config= */ null);

    }

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

+8 −1
Original line number Diff line number Diff line
@@ -4259,6 +4259,13 @@ public final class DisplayManagerService extends SystemService { 
        return !Float.isNaN(refreshRate) && (refreshRate > 0.0f);

    }



    @VisibleForTesting

    void overrideSensorManager(SensorManager sensorManager) {

        synchronized (mSyncRoot) {

            mSensorManager = sensorManager;

        }

    }



    @VisibleForTesting

    final class LocalService extends DisplayManagerInternal {
@@ -4512,7 +4519,7 @@ public final class DisplayManagerService extends SystemService { 
                }

                final DisplayDeviceConfig config = device.getDisplayDeviceConfig();

                SensorData sensorData = config.getProximitySensor();

                if (sensorData.matches(sensorName, sensorType)) {

                if (sensorData != null && sensorData.matches(sensorName, sensorType)) {

                    return new RefreshRateRange(sensorData.minRefreshRate,

                            sensorData.maxRefreshRate);

                }

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

+5 −11
Original line number Diff line number Diff line
@@ -2303,29 +2303,23 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    }



    private void loadAmbientLightSensor() {

        DisplayDeviceConfig.SensorData lightSensor = mDisplayDeviceConfig.getAmbientLightSensor();

        final int fallbackType = mDisplayId == Display.DEFAULT_DISPLAY

                ? Sensor.TYPE_LIGHT : SensorUtils.NO_FALLBACK;

        mLightSensor = SensorUtils.findSensor(mSensorManager, lightSensor.type, lightSensor.name,

                fallbackType);

        mLightSensor = SensorUtils.findSensor(mSensorManager,

                mDisplayDeviceConfig.getAmbientLightSensor(), fallbackType);

    }



    private void loadScreenOffBrightnessSensor() {

        DisplayDeviceConfig.SensorData screenOffBrightnessSensor =

                mDisplayDeviceConfig.getScreenOffBrightnessSensor();

        mScreenOffBrightnessSensor = SensorUtils.findSensor(mSensorManager,

                screenOffBrightnessSensor.type, screenOffBrightnessSensor.name,

                SensorUtils.NO_FALLBACK);

                mDisplayDeviceConfig.getScreenOffBrightnessSensor(), SensorUtils.NO_FALLBACK);

    }



    private void loadProximitySensor() {

        if (DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT || mDisplayId != Display.DEFAULT_DISPLAY) {

            return;

        }

        final DisplayDeviceConfig.SensorData proxSensor =

                mDisplayDeviceConfig.getProximitySensor();

        mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,

                Sensor.TYPE_PROXIMITY);

        mProximitySensor = SensorUtils.findSensor(mSensorManager,

                mDisplayDeviceConfig.getProximitySensor(), Sensor.TYPE_PROXIMITY);

        if (mProximitySensor != null) {

            mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),

                    TYPICAL_PROXIMITY_THRESHOLD);

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

+3 −7
Original line number Diff line number Diff line
@@ -1950,19 +1950,15 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    }



    private void loadAmbientLightSensor() {

        DisplayDeviceConfig.SensorData lightSensor = mDisplayDeviceConfig.getAmbientLightSensor();

        final int fallbackType = mDisplayId == Display.DEFAULT_DISPLAY

                ? Sensor.TYPE_LIGHT : SensorUtils.NO_FALLBACK;

        mLightSensor = SensorUtils.findSensor(mSensorManager, lightSensor.type, lightSensor.name,

                fallbackType);

        mLightSensor = SensorUtils.findSensor(mSensorManager,

                mDisplayDeviceConfig.getAmbientLightSensor(), fallbackType);

    }



    private void loadScreenOffBrightnessSensor() {

        DisplayDeviceConfig.SensorData screenOffBrightnessSensor =

                mDisplayDeviceConfig.getScreenOffBrightnessSensor();

        mScreenOffBrightnessSensor = SensorUtils.findSensor(mSensorManager,

                screenOffBrightnessSensor.type, screenOffBrightnessSensor.name,

                SensorUtils.NO_FALLBACK);

                mDisplayDeviceConfig.getScreenOffBrightnessSensor(), SensorUtils.NO_FALLBACK);

    }



    private float clampScreenBrightness(float value) {

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

+2 −4
Original line number Diff line number Diff line
@@ -358,10 +358,8 @@ public final class DisplayPowerProximityStateController { 
        if (DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT || mDisplayId != Display.DEFAULT_DISPLAY) {

            return;

        }

        final DisplayDeviceConfig.SensorData proxSensor =

                mDisplayDeviceConfig.getProximitySensor();

        mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,

                Sensor.TYPE_PROXIMITY);

        mProximitySensor = SensorUtils.findSensor(mSensorManager,

                mDisplayDeviceConfig.getProximitySensor(), Sensor.TYPE_PROXIMITY);

        if (mProximitySensor != null) {

            mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),

                    TYPICAL_PROXIMITY_THRESHOLD);