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

Commit a6551f91 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Make button brightness override actually work." into gingerbread

parents 5efe8b2f 141cb803

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

+15 −2
Original line number Diff line number Diff line
@@ -2013,12 +2013,25 @@ class PowerManagerService extends IPowerManager.Stub 
        }

        if (onMask != 0) {

            int brightness = getPreferredBrightness();

            int buttonBrightness = brightness;



            if (mButtonBrightnessOverride >= 0) {

                buttonBrightness = mButtonBrightnessOverride;

            }



            if ((newState & BATTERY_LOW_BIT) != 0 &&

                    brightness > Power.BRIGHTNESS_LOW_BATTERY) {

                brightness = Power.BRIGHTNESS_LOW_BATTERY;

                buttonBrightness = brightness;

            }

            if (mSpew) Slog.i(TAG, "Setting brightess on " + brightness + ": " + onMask);

            setLightBrightness(onMask, brightness);



            if (mSpew) {

                Slog.i(TAG, "Setting brightess on " + brightness +

                        "/" + buttonBrightness + ": " + onMask);

            }



            setLightBrightness(onMask & SCREEN_BRIGHT_BIT, brightness);

            setLightBrightness(onMask & (BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT), buttonBrightness);

        }

    }