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

Commit 791677ea authored by Santos Cordon's avatar Santos Cordon Committed by Automerger Merge Worker
Browse files

Merge "Better fix for non-SDR brightness." into sc-dev am: 2a0573bb 

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

Change-Id: Id708399797bd9ce5505a2b529b1213b9cd47cd9d
parents a12932ad 2a0573bb

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

+3 −2
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                        try {

                            final float backlight = brightnessToBacklight(brightness);

                            float nits = NITS_INVALID;

                            float sdrBacklight = backlight;

                            float sdrBacklight = PowerManager.BRIGHTNESS_INVALID_FLOAT;

                            float sdrNits = NITS_INVALID;

                            if (getDisplayDeviceConfig().hasNitsMapping()

                                    && sdrBrightness != PowerManager.BRIGHTNESS_INVALID_FLOAT) {
@@ -1306,7 +1306,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
        // Set backlight within min and max backlight values

        void setBacklight(float sdrBacklight, float sdrNits, float backlight, float nits) {

            if (mUseSurfaceControlBrightness || mForceSurfaceControl) {

                if (sdrBacklight == PowerManager.BRIGHTNESS_INVALID_FLOAT) {

                if (BrightnessSynchronizer.floatEquals(

                        sdrBacklight, PowerManager.BRIGHTNESS_INVALID_FLOAT)) {

                    mSurfaceControlProxy.setDisplayBrightness(mDisplayToken, backlight);

                } else {

                    mSurfaceControlProxy.setDisplayBrightness(mDisplayToken, sdrBacklight, sdrNits,