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

Merge "Refactor stopping the screen off brightness sensor controller" into tm-qpr-dev am: 12dbc30923

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611511

Change-Id: I8c63ea533782b2230043d3a6741310c79e9e5689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-07 19:10:00 +00:00
committed by Automerger Merge Worker
parent afdb8b1492 12dbc30923
commit 281aa08321
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -873,10 +873,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mAutomaticBrightnessController.stop(); mAutomaticBrightnessController.stop();
} }
if (mScreenOffBrightnessSensorController != null) {
mScreenOffBrightnessSensorController.stop();
}
if (mBrightnessSetting != null) { if (mBrightnessSetting != null) {
mBrightnessSetting.unregisterListener(mBrightnessSettingListener); mBrightnessSetting.unregisterListener(mBrightnessSettingListener);
} }
@@ -1125,6 +1121,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mScreenOffBrightnessSensorController != null) { if (mScreenOffBrightnessSensorController != null) {
mScreenOffBrightnessSensorController.stop(); mScreenOffBrightnessSensorController.stop();
mScreenOffBrightnessSensorController = null;
} }
loadScreenOffBrightnessSensor(); loadScreenOffBrightnessSensor();
int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux(); int[] sensorValueToLux = mDisplayDeviceConfig.getScreenOffBrightnessSensorValueToLux();
@@ -1242,6 +1239,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mPowerState.stop(); mPowerState.stop();
mPowerState = null; mPowerState = null;
} }
if (mScreenOffBrightnessSensorController != null) {
mScreenOffBrightnessSensorController.stop();
}
} }
private void updatePowerState() { private void updatePowerState() {