Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev

Browse Source
This commit is contained in:
Julius D'souza
2016-12-01 22:26:02 +00:00
committed by Android (Google) Code Review
parent 6abcefd350 5c7ae14148
commit afccacad68
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/AutomaticBrightnessController.java
View File

@@ -208,7 +208,7 @@ class AutomaticBrightnessController {
mDozeScaleFactor = dozeScaleFactor; mDozeScaleFactor = dozeScaleFactor;
mNormalLightSensorRate = lightSensorRate; mNormalLightSensorRate = lightSensorRate;
mInitialLightSensorRate = initialLightSensorRate; mInitialLightSensorRate = initialLightSensorRate;
mCurrentLightSensorRate = mNormalLightSensorRate; mCurrentLightSensorRate = -1;
mBrighteningLightDebounceConfig = brighteningLightDebounceConfig; mBrighteningLightDebounceConfig = brighteningLightDebounceConfig;
mDarkeningLightDebounceConfig = darkeningLightDebounceConfig; mDarkeningLightDebounceConfig = darkeningLightDebounceConfig;
mResetAmbientLuxAfterWarmUpConfig = resetAmbientLuxAfterWarmUpConfig; mResetAmbientLuxAfterWarmUpConfig = resetAmbientLuxAfterWarmUpConfig;
@@ -320,6 +320,7 @@ class AutomaticBrightnessController {
mInitialHorizonAmbientLightRingBuffer.clear(); mInitialHorizonAmbientLightRingBuffer.clear();
mAmbientLuxValid = !mResetAmbientLuxAfterWarmUpConfig; mAmbientLuxValid = !mResetAmbientLuxAfterWarmUpConfig;
mLightSensorEnableTime = SystemClock.uptimeMillis(); mLightSensorEnableTime = SystemClock.uptimeMillis();
mCurrentLightSensorRate = mInitialLightSensorRate;
mSensorManager.registerListener(mLightSensorListener, mLightSensor, mSensorManager.registerListener(mLightSensorListener, mLightSensor,
mCurrentLightSensorRate * 1000, mHandler); mCurrentLightSensorRate * 1000, mHandler);
return true; return true;
@@ -328,9 +329,7 @@ class AutomaticBrightnessController {
if (mLightSensorEnabled) { if (mLightSensorEnabled) {
mLightSensorEnabled = false; mLightSensorEnabled = false;
mRecentLightSamples = 0; mRecentLightSamples = 0;
if (mInitialLightSensorRate > 0) { mCurrentLightSensorRate = -1;
mCurrentLightSensorRate = mInitialLightSensorRate;
}
mHandler.removeMessages(MSG_UPDATE_AMBIENT_LUX); mHandler.removeMessages(MSG_UPDATE_AMBIENT_LUX);
mSensorManager.unregisterListener(mLightSensorListener); mSensorManager.unregisterListener(mLightSensorListener);
} }

7
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -315,6 +315,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
com.android.internal.R.integer.config_autoBrightnessLightSensorRate); com.android.internal.R.integer.config_autoBrightnessLightSensorRate);
int initialLightSensorRate = resources.getInteger( int initialLightSensorRate = resources.getInteger(
com.android.internal.R.integer.config_autoBrightnessInitialLightSensorRate); 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( long brighteningLightDebounce = resources.getInteger(
com.android.internal.R.integer.config_autoBrightnessBrighteningLightDebounce); com.android.internal.R.integer.config_autoBrightnessBrighteningLightDebounce);
long darkeningLightDebounce = resources.getInteger( long darkeningLightDebounce = resources.getInteger(