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

Commit 15720a4c authored by Daniel Solomon's avatar Daniel Solomon Committed by android-build-merger
Browse files

Merge "Reset DWB color temperature when DWBC is disabled" into qt-dev 

am: a12befb7

Change-Id: I8f76904e54fab1d2e65a33a7cc1c79dc9b0e75fd
parents 915554cf a12befb7

services/core/java/com/android/server/display/color/ColorDisplayService.java

+8 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,14 @@ public final class ColorDisplayService extends SystemService { 
            return false;

        }



        /**

         * Reset the CCT value for the display white balance transform to its default value.

         */

        public boolean resetDisplayWhiteBalanceColorTemperature() {

            return setDisplayWhiteBalanceColorTemperature(getContext().getResources()

                    .getInteger(R.integer.config_displayWhiteBalanceColorTemperatureDefault));

        }



        /**

         * Sets the listener and returns whether display white balance is currently enabled.

         */

services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ public class DisplayWhiteBalanceController implements 
        mThrottler.clear();

        mAmbientColorTemperature = -1.0f;

        mPendingAmbientColorTemperature = -1.0f;

        mColorDisplayServiceInternal.resetDisplayWhiteBalanceColorTemperature();

        return true;

    }