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

Merge "Clamp brightness before saving it"

Browse Source
This commit is contained in:
Piotr Wilczyński
2023-07-03 15:39:55 +00:00
committed by Android (Google) Code Review
parent f0568174d9 f214018142
commit 76e69b062e
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2672,10 +2672,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
public void setBrightness(float brightnessValue, int userSerial) {
// Update the setting, which will eventually call back into DPC to have us actually update
// the display with the new value.
float clampedBrightnessValue = clampScreenBrightness(brightnessValue);
mBrightnessSetting.setUserSerial(userSerial);
mBrightnessSetting.setBrightness(brightnessValue);
mBrightnessSetting.setBrightness(clampedBrightnessValue);
if (mDisplayId == Display.DEFAULT_DISPLAY && mPersistBrightnessNitsForDefaultDisplay) {
float nits = convertToNits(brightnessValue);
float nits = convertToNits(clampedBrightnessValue);
if (nits >= 0) {
mBrightnessSetting.setBrightnessNitsForDefaultDisplay(nits);
}

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

@@ -2185,7 +2185,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
@Override
public void setBrightness(float brightnessValue, int userSerial) {
mDisplayBrightnessController.setBrightness(brightnessValue, userSerial);
mDisplayBrightnessController.setBrightness(clampScreenBrightness(brightnessValue),
userSerial);
}
@Override

10
services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java
View File

@@ -1086,6 +1086,16 @@ public final class DisplayPowerController2Test {
.getThermalBrightnessThrottlingDataMapByThrottlingId();
}
@Test
public void testSetBrightness_BrightnessShouldBeClamped() {
float clampedBrightness = 0.6f;
when(mHolder.hbmController.getCurrentBrightnessMax()).thenReturn(clampedBrightness);
mHolder.dpc.setBrightness(PowerManager.BRIGHTNESS_MAX);
verify(mHolder.brightnessSetting).setBrightness(clampedBrightness);
}
/**
* Creates a mock and registers it to {@link LocalServices}.
*/

10
services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerControllerTest.java
View File

@@ -1092,6 +1092,16 @@ public final class DisplayPowerControllerTest {
.getThermalBrightnessThrottlingDataMapByThrottlingId();
}
@Test
public void testSetBrightness_BrightnessShouldBeClamped() {
float clampedBrightness = 0.6f;
when(mHolder.hbmController.getCurrentBrightnessMax()).thenReturn(clampedBrightness);
mHolder.dpc.setBrightness(PowerManager.BRIGHTNESS_MAX);
verify(mHolder.brightnessSetting).setBrightness(clampedBrightness);
}
/**
* Creates a mock and registers it to {@link LocalServices}.
*/