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

Merge "Fix PowerIncidentTest" into rvc-dev am: 36eeacc058 am: c0d784e00f

Browse Source 
Change-Id: Ic4e8e7cd1dee3a5be48c768dc5d2475b4cb94c89
This commit is contained in:
Automerger Merge Worker
2020-02-27 18:19:28 +00:00
parent 7954a6c19c c0d784e00f
commit 564fa2d290
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 { message ScreenBrightnessSettingLimitsProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC; option (.android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 setting_minimum = 1; reserved 1, 2, 3; // setting_minimum, setting_maximum, setting_default
optional int32 setting_maximum = 2; optional float setting_minimum_float = 4;
optional int32 setting_default = 3; optional float setting_maximum_float = 5;
optional float setting_default_float = 6;
} }
// True to decouple auto-suspend mode from the display state. // 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); .SCREEN_BRIGHTNESS_SETTING_LIMITS);
proto.write( proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_MINIMUM, .SETTING_MINIMUM_FLOAT,
mScreenBrightnessSettingMinimum); mScreenBrightnessSettingMinimum);
proto.write( proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_MAXIMUM, .SETTING_MAXIMUM_FLOAT,
mScreenBrightnessSettingMaximum); mScreenBrightnessSettingMaximum);
proto.write( proto.write(
PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
.SETTING_DEFAULT, .SETTING_DEFAULT_FLOAT,
mScreenBrightnessSettingDefault); mScreenBrightnessSettingDefault);
proto.end(screenBrightnessSettingLimitsToken); proto.end(screenBrightnessSettingLimitsToken);