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

Merge "Only load default lightsensor for Brightness Tracker" into tm-qpr-dev

Browse Source
This commit is contained in:
Fiona Campbell
2022-11-07 09:54:45 +00:00
committed by Android (Google) Code Review
parent 6cc66e4581 fccce26e13
commit 10cd7d5904
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -2598,7 +2598,7 @@ public final class DisplayManagerService extends SystemService {
// initPowerManagement has not yet been called. // initPowerManagement has not yet been called.
return; return;
} }
if (mBrightnessTracker == null) { if (mBrightnessTracker == null && display.getDisplayIdLocked() == Display.DEFAULT_DISPLAY) {
mBrightnessTracker = new BrightnessTracker(mContext, null); mBrightnessTracker = new BrightnessTracker(mContext, null);
} }

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

@@ -913,7 +913,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Initialize all of the brightness tracking state // Initialize all of the brightness tracking state
final float brightness = convertToNits(mPowerState.getScreenBrightness()); final float brightness = convertToNits(mPowerState.getScreenBrightness());
if (brightness >= PowerManager.BRIGHTNESS_MIN) { if (mBrightnessTracker != null && brightness >= PowerManager.BRIGHTNESS_MIN) {
mBrightnessTracker.start(brightness); mBrightnessTracker.start(brightness);
} }
mBrightnessSettingListener = brightnessValue -> { mBrightnessSettingListener = brightnessValue -> {
@@ -1045,7 +1045,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
} }
loadAmbientLightSensor(); loadAmbientLightSensor();
if (mBrightnessTracker != null) { // BrightnessTracker should only use one light sensor, we want to use the light sensor
// from the default display and not e.g. temporary displays when switching layouts.
if (mBrightnessTracker != null && mDisplayId == Display.DEFAULT_DISPLAY) {
mBrightnessTracker.setLightSensor(mLightSensor); mBrightnessTracker.setLightSensor(mLightSensor);
} }
@@ -2453,7 +2455,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
boolean hadUserDataPoint) { boolean hadUserDataPoint) {
final float brightnessInNits = convertToNits(brightness); final float brightnessInNits = convertToNits(brightness);
if (mPowerRequest.useAutoBrightness && brightnessInNits >= 0.0f if (mPowerRequest.useAutoBrightness && brightnessInNits >= 0.0f
&& mAutomaticBrightnessController != null) { && mAutomaticBrightnessController != null && mBrightnessTracker != null) {
// We only want to track changes on devices that can actually map the display backlight // We only want to track changes on devices that can actually map the display backlight
// values into a physical brightness unit since the value provided by the API is in // values into a physical brightness unit since the value provided by the API is in
// nits and not using the arbitrary backlight units. // nits and not using the arbitrary backlight units.