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

Commit 4e9400ab authored by Julius D'souza's avatar Julius D'souza Committed by android-build-merger
Browse files

DO NOT MERGE: Sync with master: Add initial ambient light sensor rate am: 5c7ae141 

am: a83f9403

Change-Id: I9d70652892014783ec444d3c38f3a1aef546de78
parents 46eb3f6c a83f9403

services/core/java/com/android/server/display/AutomaticBrightnessController.java

+3 −4
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ class AutomaticBrightnessController { 
        mDozeScaleFactor = dozeScaleFactor;

        mNormalLightSensorRate = lightSensorRate;

        mInitialLightSensorRate = initialLightSensorRate;

        mCurrentLightSensorRate = mNormalLightSensorRate;

        mCurrentLightSensorRate = -1;

        mBrighteningLightDebounceConfig = brighteningLightDebounceConfig;

        mDarkeningLightDebounceConfig = darkeningLightDebounceConfig;

        mResetAmbientLuxAfterWarmUpConfig = resetAmbientLuxAfterWarmUpConfig;
@@ -320,6 +320,7 @@ class AutomaticBrightnessController { 
                mInitialHorizonAmbientLightRingBuffer.clear();

                mAmbientLuxValid = !mResetAmbientLuxAfterWarmUpConfig;

                mLightSensorEnableTime = SystemClock.uptimeMillis();

                mCurrentLightSensorRate = mInitialLightSensorRate;

                mSensorManager.registerListener(mLightSensorListener, mLightSensor,

                        mCurrentLightSensorRate * 1000, mHandler);

                return true;
@@ -328,9 +329,7 @@ class AutomaticBrightnessController { 
            if (mLightSensorEnabled) {

                mLightSensorEnabled = false;

                mRecentLightSamples = 0;

                if (mInitialLightSensorRate > 0) {

                    mCurrentLightSensorRate = mInitialLightSensorRate;

                }

                mCurrentLightSensorRate = -1;

                mHandler.removeMessages(MSG_UPDATE_AMBIENT_LUX);

                mSensorManager.unregisterListener(mLightSensorListener);

            }

services/core/java/com/android/server/display/DisplayPowerController.java

+7 −0
Original line number Diff line number Diff line
@@ -315,6 +315,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                com.android.internal.R.integer.config_autoBrightnessLightSensorRate);

        int initialLightSensorRate = resources.getInteger(

                com.android.internal.R.integer.config_autoBrightnessInitialLightSensorRate);

        if (initialLightSensorRate == -1) {

          initialLightSensorRate = lightSensorRate;

        } else if (initialLightSensorRate > lightSensorRate) {

          Slog.w(TAG, "Expected config_autoBrightnessInitialLightSensorRate ("

                  + initialLightSensorRate + ") to be less than or equal to "

                  + "config_autoBrightnessLightSensorRate (" + lightSensorRate + ").");

        }

        long brighteningLightDebounce = resources.getInteger(

                com.android.internal.R.integer.config_autoBrightnessBrighteningLightDebounce);

        long darkeningLightDebounce = resources.getInteger(