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

Commit 10a05c05 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Only load default lightsensor for Brightness Tracker" into tm-qpr-dev am: 10cd7d59 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20245644



Change-Id: I3f67e881105afbe356a9d8bd717a3c8cd4791b4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b15e857a 10cd7d59

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

+1 −1
Original line number Diff line number Diff line
@@ -2598,7 +2598,7 @@ public final class DisplayManagerService extends SystemService { 
            // initPowerManagement has not yet been called.

            return;

        }

        if (mBrightnessTracker == null) {

        if (mBrightnessTracker == null && display.getDisplayIdLocked() == Display.DEFAULT_DISPLAY) {

            mBrightnessTracker = new BrightnessTracker(mContext, null);

        }

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

+5 −3
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


        // Initialize all of the brightness tracking state

        final float brightness = convertToNits(mPowerState.getScreenBrightness());

        if (brightness >= PowerManager.BRIGHTNESS_MIN) {

        if (mBrightnessTracker != null && brightness >= PowerManager.BRIGHTNESS_MIN) {

            mBrightnessTracker.start(brightness);

        }

        mBrightnessSettingListener = brightnessValue -> {
@@ -1045,7 +1045,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            }



            loadAmbientLightSensor();

            if (mBrightnessTracker != null) {

            // BrightnessTracker should only use one light sensor, we want to use the light sensor

            // from the default display and not e.g. temporary displays when switching layouts.

            if (mBrightnessTracker != null && mDisplayId == Display.DEFAULT_DISPLAY) {

                mBrightnessTracker.setLightSensor(mLightSensor);

            }
@@ -2453,7 +2455,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            boolean hadUserDataPoint) {

        final float brightnessInNits = convertToNits(brightness);

        if (mPowerRequest.useAutoBrightness && brightnessInNits >= 0.0f

                && mAutomaticBrightnessController != null) {

                && mAutomaticBrightnessController != null && mBrightnessTracker != null) {

            // We only want to track changes on devices that can actually map the display backlight

            // values into a physical brightness unit since the value provided by the API is in

            // nits and not using the arbitrary backlight units.