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

Commit dc4811e2 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert Change I5ec0e757: Don't enable the light sensor if it's... 

Merge "Revert "Revert Change I5ec0e757: Don't enable the light sensor if it's not being used"" into gingerbread
parents 7657b943 fad9bf0a

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

+3 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ class PowerManagerService extends IPowerManager.Stub 
    private int mScreenBrightnessOverride = -1;

    private int mButtonBrightnessOverride = -1;

    private boolean mUseSoftwareAutoBrightness;

    private boolean mAutoBrightessEnabled;

    private boolean mAutoBrightessEnabled = true;

    private int[] mAutoBrightnessLevels;

    private int[] mLcdBacklightValues;

    private int[] mButtonBacklightValues;
@@ -482,6 +482,7 @@ class PowerManagerService extends IPowerManager.Stub 
        }



        public void update(Observable o, Object arg) {



            synchronized (mLocks) {

                // STAY_ON_WHILE_PLUGGED_IN, default to when plugged into AC

                mStayOnConditions = getInt(STAY_ON_WHILE_PLUGGED_IN,
@@ -1675,7 +1676,7 @@ class PowerManagerService extends IPowerManager.Stub 
        if (err == 0) {

            mLastScreenOnTime = (on ? SystemClock.elapsedRealtime() : 0);

            if (mUseSoftwareAutoBrightness) {

                enableLightSensor(on);

                enableLightSensor(on && mAutoBrightessEnabled);

                if (!on) {

                    // make sure button and key backlights are off too

                    mButtonLight.turnOff();