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

Commit 5dca30af authored by Mike Lockwood's avatar Mike Lockwood
Browse files

PowerManagerService: Remove assumption that light sensor will always send a... 


PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.

Bug: 5426212

Change-Id: Iebe51609233ef17c108bbec680369793abbae1be
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 8334038f

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

+43 −35
Original line number Diff line number Diff line
@@ -1698,11 +1698,6 @@ public class PowerManagerService extends IPowerManager.Stub 
                    // make sure button and key backlights are off too

                    mButtonLight.turnOff();

                    mKeyboardLight.turnOff();

                    // clear current value so we will update based on the new conditions

                    // when the sensor is reenabled.

                    mLightSensorValue = -1;

                    // reset our highest light sensor value when the screen turns off

                    mHighestLightSensorValue = -1;

                }

            }

        }
@@ -2472,6 +2467,7 @@ public class PowerManagerService extends IPowerManager.Stub 
        synchronized (mLocks) {

            mIsDocked = (state != Intent.EXTRA_DOCK_STATE_UNDOCKED);

            if (mIsDocked) {

                // allow brightness to decrease when docked

                mHighestLightSensorValue = -1;

            }

            if ((mPowerState & SCREEN_ON_BIT) != 0) {
@@ -3047,11 +3043,21 @@ public class PowerManagerService extends IPowerManager.Stub 
            long identity = Binder.clearCallingIdentity();

            try {

                if (enable) {

                    // reset our highest value when reenabling

                    mHighestLightSensorValue = -1;

                    // force recompute of backlight values

                    if (mLightSensorValue >= 0) {

                        int value = (int)mLightSensorValue;

                        mLightSensorValue = -1;

                        handleLightSensorValue(value);

                    }

                    mSensorManager.registerListener(mLightListener, mLightSensor,

                            SensorManager.SENSOR_DELAY_NORMAL);

                } else {

                    mSensorManager.unregisterListener(mLightListener);

                    mHandler.removeCallbacks(mAutoBrightnessTask);

                    mLightSensorPendingDecrease = false;

                    mLightSensorPendingIncrease = false;

                }

            } finally {

                Binder.restoreCallingIdentity(identity);
@@ -3103,19 +3109,8 @@ public class PowerManagerService extends IPowerManager.Stub 
        }

    };



    SensorEventListener mLightListener = new SensorEventListener() {

        public void onSensorChanged(SensorEvent event) {

            synchronized (mLocks) {

                // ignore light sensor while screen is turning off

                if (isScreenTurningOffLocked()) {

                    return;

                }



                int value = (int)event.values[0];

    private void handleLightSensorValue(int value) {

        long milliseconds = SystemClock.elapsedRealtime();

                if (mDebugLightSensor) {

                    Slog.d(TAG, "onSensorChanged: light value: " + value);

                }

        if (mLightSensorValue == -1 ||

                milliseconds < mLastScreenOnTime + mLightSensorWarmupTime) {

            // process the value immediately if screen has just turned on
@@ -3141,6 +3136,19 @@ public class PowerManagerService extends IPowerManager.Stub 
            }

        }

    }



    SensorEventListener mLightListener = new SensorEventListener() {

        public void onSensorChanged(SensorEvent event) {

            if (mDebugLightSensor) {

                Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]);

            }

            synchronized (mLocks) {

                // ignore light sensor while screen is turning off

                if (isScreenTurningOffLocked()) {

                    return;

                }

                handleLightSensorValue((int)event.values[0]);

            }

        }



        public void onAccuracyChanged(Sensor sensor, int accuracy) {