diff options
| author | 2020-02-27 18:13:31 +0000 | |
|---|---|---|
| committer | 2020-02-27 18:13:31 +0000 | |
| commit | 36eeacc058e18260a9f680989d1090315da81606 (patch) | |
| tree | 4a70e7bfce5d24510595ea514ee44ce4905139bd | |
| parent | d050812a30d2b04f6f027989e1b0227f27426238 (diff) | |
| parent | 14eef1368c5c6687c636e2d21400203c679b35bb (diff) | |
Merge "Fix PowerIncidentTest" into rvc-dev
| -rw-r--r-- | core/proto/android/server/powermanagerservice.proto | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/proto/android/server/powermanagerservice.proto b/core/proto/android/server/powermanagerservice.proto index 6850d0109913..0455d58f498b 100644 --- a/core/proto/android/server/powermanagerservice.proto +++ b/core/proto/android/server/powermanagerservice.proto @@ -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. diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 8483c774cb8e..e6c23b66eba2 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -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); |