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

Commit f4a502a2 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Don't adjust lights if screen or button brightness is changed when the... 

Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
parents 8f2ca788 f527c715

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

+8 −2
Original line number Diff line number Diff line
@@ -1342,24 +1342,30 @@ class PowerManagerService extends IPowerManager.Stub 
    public void setScreenBrightnessOverride(int brightness) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);



        if (mSpew) Slog.d(TAG, "setScreenBrightnessOverride " + brightness);

        synchronized (mLocks) {

            if (mScreenBrightnessOverride != brightness) {

                mScreenBrightnessOverride = brightness;

                if (isScreenOn()) {

                    updateLightsLocked(mPowerState, SCREEN_ON_BIT);

                }

            }

        }

    }



    public void setButtonBrightnessOverride(int brightness) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);



        if (mSpew) Slog.d(TAG, "setButtonBrightnessOverride " + brightness);

         synchronized (mLocks) {

           if (mButtonBrightnessOverride != brightness) {

                mButtonBrightnessOverride = brightness;

                if (isScreenOn()) {

                    updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT);

                }

            }

        }

    }



    /**

     * Sanity-check that gets called 5 seconds after any call to