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

Commit 2d155d26 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

PowerManagerService: Fix bug resulting in backlights turning on while screen is off. 



Fixes bugs b/2216879 and b/2197060

Change-Id: I5de3cbdbc0601dd7950dba74cacfff06d41ad18e
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 8061f64f

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

+15 −10
Original line number Diff line number Diff line
@@ -2037,16 +2037,21 @@ class PowerManagerService extends IPowerManager.Stub 
    }



    private void setScreenBrightnessMode(int mode) {

        mAutoBrightessEnabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);

        boolean enabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);

        if (mAutoBrightessEnabled != enabled) {

            mAutoBrightessEnabled = enabled;

            // reset computed brightness

            mLightSensorBrightness = -1;



            if (mHasHardwareAutoBrightness) {

                // When setting auto-brightness, must reset the brightness afterwards

            mHardware.setAutoBrightness_UNCHECKED(mAutoBrightessEnabled);

                mHardware.setAutoBrightness_UNCHECKED(enabled);

                if (screenIsOn()) {

                    setBacklightBrightness((int)mScreenBrightness.curValue);

                }

            } else {

            enableLightSensor(screenIsOn() && mAutoBrightessEnabled);

                enableLightSensor(screenIsOn() && enabled);

            }

        }

    }