Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
12dbc30923
@@ -873,10 +873,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
|
||||
mAutomaticBrightnessController.stop();
|
||||
}
|
||||
|
||||
if (mScreenOffBrightnessSensorController != null) {
|
||||
mScreenOffBrightnessSensorController.stop();
|
||||
}
|
||||
|
||||
if (mBrightnessSetting != null) {
|
||||
mBrightnessSetting.unregisterListener(mBrightnessSettingListener);
|
||||
}
|
||||
@@ -1125,6 +1121,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
|
||||
|
||||
if (mScreenOffBrightnessSensorController != null) {
|
||||
mScreenOffBrightnessSensorController.stop();
|
||||
mScreenOffBrightnessSensorController = null;
|
||||
}
|
||||
loadScreenOffBrightnessSensor();
|
||||
int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux();
|
||||
@@ -1242,6 +1239,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
|
||||
mPowerState.stop();
|
||||
mPowerState = null;
|
||||
}
|
||||
|
||||
if (mScreenOffBrightnessSensorController != null) {
|
||||
mScreenOffBrightnessSensorController.stop();
|
||||
}
|
||||
}
|
||||
|
||||
private void updatePowerState() {
|
||||
|
||||
Reference in New Issue
Block a user