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

NBMController should load DDC data on creation

Browse Source 
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
This commit is contained in:
Oleg Petsjonkin
2023-07-19 10:33:47 +00:00
committed by Oleg Petšjonkin
parent 1e68575dd5
commit 1f04a11225
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

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

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

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