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

Commit 7cc801a8 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "NBMController should load DDC data on creation" into udc-d1-dev

parents c1590ab6 72524ce8

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,