Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oleg Petšjonkin
2023-07-21 10:33:58 +00:00
committed by Android (Google) Code Review
parent c1590ab67f 72524ce860
commit 7cc801a8d9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/display/BrightnessRangeController.java
View File

@@ -33,9 +33,10 @@ class BrightnessRangeController {
private final Runnable mModeChangeCallback; private final Runnable mModeChangeCallback;
BrightnessRangeController(HighBrightnessModeController hbmController, BrightnessRangeController(HighBrightnessModeController hbmController,
Runnable modeChangeCallback) { Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {
mHbmController = hbmController; mHbmController = hbmController;
mModeChangeCallback = modeChangeCallback; mModeChangeCallback = modeChangeCallback;
mNormalBrightnessModeController.resetNbmData(displayDeviceConfig.getLuxThrottlingData());
} }

2
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -666,7 +666,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();

2
services/core/java/com/android/server/display/DisplayPowerController2.java
View File

@@ -544,7 +544,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,