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 am: 7cc801a8d9

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

Change-Id: Ib1b8d96b3e3077ba0a8c212558d4ca63ddc8a926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oleg Petšjonkin
2023-07-21 11:18:57 +00:00
committed by Automerger Merge Worker
parent a49a2cfab2 7cc801a8d9
commit 0bd30361d7
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;
BrightnessRangeController(HighBrightnessModeController hbmController,
Runnable modeChangeCallback) {
Runnable modeChangeCallback, DisplayDeviceConfig displayDeviceConfig) {
mHbmController = hbmController;
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);
mBrightnessRangeController = new BrightnessRangeController(hbmController,
modeChangeCallback);
modeChangeCallback, mDisplayDeviceConfig);
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();
mBrightnessRangeController = new BrightnessRangeController(hbmController,
modeChangeCallback);
modeChangeCallback, mDisplayDeviceConfig);
mDisplayBrightnessController =
new DisplayBrightnessController(context, null,