Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564fa2d2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix PowerIncidentTest" into rvc-dev am: 36eeacc0 am: c0d784e0 

Change-Id: Ic4e8e7cd1dee3a5be48c768dc5d2475b4cb94c89
parents 7954a6c1 c0d784e0

core/proto/android/server/powermanagerservice.proto

+4 −3
Original line number Original line Diff line number Diff line
@@ -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.

services/core/java/com/android/server/power/PowerManagerService.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -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);