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

Commit 1f04a112 authored by Oleg Petsjonkin's avatar Oleg Petsjonkin Committed by Oleg Petšjonkin
Browse files

NBMController should load DDC data on creation 

HBMController loads DDC in constructor, NBMController sholud do the same
(otherwise there will be no lux throttling data before onDisplayChange
event)
Please note, Clampers already handing it properly see where
BrightnessClampersController is constructed.

Bug: b/277877293

Test: hardcode DisplayDeviceConfig.mLuxThrotllingData,
use adb shell dumpsys display to verify that
NBMController.mBrightnessLimits is set

Change-Id: I16a31665d963ab0917c4f7be173134b37e0613e7
parent 1e68575d

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

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




    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback) {

        this(hbmController, modeChangeCallback,

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {

        this(hbmController, modeChangeCallback, displayDeviceConfig,

                new DeviceConfigParameterProvider(DeviceConfigInterface.REAL));

    }



    BrightnessRangeController(HighBrightnessModeController hbmController,

            Runnable modeChangeCallback, DeviceConfigParameterProvider configParameterProvider) {

            Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig,

            DeviceConfigParameterProvider configParameterProvider) {

        mHbmController = hbmController;

        mModeChangeCallback = modeChangeCallback;

        mUseNbmController = configParameterProvider.isNormalBrightnessControllerFeatureEnabled();

        mNormalBrightnessModeController.resetNbmData(displayDeviceConfig.getLuxThrottlingData());

    }



    void dump(PrintWriter pw) {

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

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,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
@@ -550,7 +550,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mBrightnessThrottler = createBrightnessThrottlerLocked();



        mBrightnessRangeController = new BrightnessRangeController(hbmController,

                modeChangeCallback);

                modeChangeCallback, mDisplayDeviceConfig);



        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null,