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

Fix the issue where the first brightness for a device was set to 0

Browse Source 
Bug: 267479840
Test: Manually verified that the first brightness is set to the default
value

Change-Id: Ibc2f038d4651e8e0d05b2ab77945bdc0cd76f962
This commit is contained in:
Rupesh Bansal
2023-02-01 19:00:53 +00:00
parent b4ee4ef146
commit 7303db73eb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ public final class DisplayBrightnessController {
// TODO: b/186428377 update brightness setting when display changes
mBrightnessSetting = brightnessSetting;
mPendingScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;
mScreenBrightnessDefault = BrightnessUtils.clampAbsoluteBrightness(defaultScreenBrightness);
mCurrentScreenBrightness = getScreenBrightnessSetting();
mOnBrightnessChangeRunnable = onBrightnessChangeRunnable;
mScreenBrightnessDefault = BrightnessUtils.clampAbsoluteBrightness(defaultScreenBrightness);
mDisplayBrightnessStrategySelector = injector.getDisplayBrightnessStrategySelector(context,
displayId);
}

9
services/tests/servicestests/src/com/android/server/display/brightness/DisplayBrightnessControllerTest.java
View File

@@ -47,7 +47,7 @@ import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public final class DisplayBrightnessControllerTest {
private static final int DISPLAY_ID = 1;
private static final float DEFAULT_BRIGHTNESS = 0.4f;
private static final float DEFAULT_BRIGHTNESS = 0.15f;
@Mock
private DisplayBrightnessStrategySelector mDisplayBrightnessStrategySelector;
@@ -70,10 +70,17 @@ public final class DisplayBrightnessControllerTest {
return mDisplayBrightnessStrategySelector;
}
};
when(mBrightnessSetting.getBrightness()).thenReturn(Float.NaN);
mDisplayBrightnessController = new DisplayBrightnessController(mContext, injector,
DISPLAY_ID, DEFAULT_BRIGHTNESS, mBrightnessSetting, mOnBrightnessChangeRunnable);
}
@Test
public void testIfFirstScreenBrightnessIsDefault() {
assertEquals(mDisplayBrightnessController.getCurrentBrightness(), DEFAULT_BRIGHTNESS,
0.0f);
}
@Test
public void testUpdateBrightness() {
DisplayPowerRequest displayPowerRequest = mock(DisplayPowerRequest.class);