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

Commit 45d86f6d authored by Oleg Petsjonkin's avatar Oleg Petsjonkin Committed by Automerger Merge Worker
Browse files

NBMController should load DDC data on creation am: 1f04a112 am: aaaa4509 

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



Change-Id: I9a8eaafdc8b45912988263dcfac52a4d8f54c083
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21b5327d aaaa4509

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -36,16 +36,18 @@ class BrightnessRangeController { 








    BrightnessRangeController(HighBrightnessModeController hbmController,

    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback) {

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {

        this(hbmController, modeChangeCallback,

        this(hbmController, modeChangeCallback, displayDeviceConfig,

                new DeviceConfigParameterProvider(DeviceConfigInterface.REAL));

                new DeviceConfigParameterProvider(DeviceConfigInterface.REAL));

    }

    }





    BrightnessRangeController(HighBrightnessModeController hbmController,

    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback, DeviceConfigParameterProvider configParameterProvider) {

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig,

            DeviceConfigParameterProvider configParameterProvider) {

        mHbmController = hbmController;

        mHbmController = hbmController;

        mModeChangeCallback = modeChangeCallback;

        mModeChangeCallback = modeChangeCallback;

        mUseNbmController = configParameterProvider.isNormalBrightnessControllerFeatureEnabled();

        mUseNbmController = configParameterProvider.isNormalBrightnessControllerFeatureEnabled();

        mNormalBrightnessModeController.resetNbmData(displayDeviceConfig.getLuxThrottlingData());

    }

    }





    void dump(PrintWriter pw) {

    void dump(PrintWriter pw) {

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

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

        HighBrightnessModeController hbmController = createHbmControllerLocked(modeChangeCallback);





        mBrightnessRangeController = new BrightnessRangeController(hbmController,

        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback);

                modeChangeCallback, mDisplayDeviceConfig);





        mBrightnessThrottler = createBrightnessThrottlerLocked();

        mBrightnessThrottler = createBrightnessThrottlerLocked();

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

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

        mBrightnessThrottler = createBrightnessThrottlerLocked();





        mBrightnessRangeController = new BrightnessRangeController(hbmController,

        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback);

                modeChangeCallback, mDisplayDeviceConfig);





        mDisplayBrightnessController =

        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null,

                new DisplayBrightnessController(context, null,