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

Commit 0bd30361 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Automerger Merge Worker
Browse files

Merge "NBMController should load DDC data on creation" into udc-d1-dev am: 7cc801a8 

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



Change-Id: Ib1b8d96b3e3077ba0a8c212558d4ca63ddc8a926
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a49a2cfa 7cc801a8

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

+2 −1
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ class BrightnessRangeController { 
    private final Runnable mModeChangeCallback;



    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback) {

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {

        mHbmController = hbmController;

        mModeChangeCallback = modeChangeCallback;

        mNormalBrightnessModeController.resetNbmData(displayDeviceConfig.getLuxThrottlingData());

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        HighBrightnessModeController hbmController = createHbmControllerLocked(modeChangeCallback);



        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback);

                modeChangeCallback, mDisplayDeviceConfig);



        mBrightnessThrottler = createBrightnessThrottlerLocked();

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

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mBrightnessThrottler = createBrightnessThrottlerLocked();



        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback);

                modeChangeCallback, mDisplayDeviceConfig);



        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null,