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

Fix PowerIncidentTest

Browse Source 
ag/9684175 changed mScreenBrightnessSettingMinimum,
mScreenBrightnessSettingMaximum and mScreenBrightnessSettingDefault
to float without changing proto dump and cts.

Bug: 149895022
Exempt-From-Owner-Approval: Minor change to fix CTS test
Test: atest CtsIncidentHostTestCases:com.android.server.cts.IncidentdTest#testIncidentReportDumpExplicit
Change-Id: Ief85ba8299626a3d92fb43db162a1b6864c8eae0
This commit is contained in:
Mike Ma
2020-02-26 19:16:44 -08:00
parent d506a78e94
commit 14eef1368c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/proto/android/server/powermanagerservice.proto
View File

@@ -225,9 +225,10 @@ message PowerServiceSettingsAndConfigurationDumpProto {
message ScreenBrightnessSettingLimitsProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 setting_minimum = 1;
optional int32 setting_maximum = 2;
optional int32 setting_default = 3;
reserved 1, 2, 3; // setting_minimum, setting_maximum, setting_default
optional float setting_minimum_float = 4;
optional float setting_maximum_float = 5;
optional float setting_default_float = 6;
}
// True to decouple auto-suspend mode from the display state.

6
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -4213,15 +4213,15 @@ public final class PowerManagerService extends SystemService
.SCREEN_BRIGHTNESS_SETTING_LIMITS);
proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_MINIMUM,
.SETTING_MINIMUM_FLOAT,
mScreenBrightnessSettingMinimum);
proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_MAXIMUM,
.SETTING_MAXIMUM_FLOAT,
mScreenBrightnessSettingMaximum);
proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_DEFAULT,
.SETTING_DEFAULT_FLOAT,
mScreenBrightnessSettingDefault);
proto.end(screenBrightnessSettingLimitsToken);