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

Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b92

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

Change-Id: I6a7226bd87e9c1d7e4d90e262a49044db41f3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Silvia Vinyes
2022-11-11 14:28:28 +00:00
committed by Automerger Merge Worker
parent 84dea87491 6bb34e9b92
commit 793ddfa8d1
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2810,18 +2810,22 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
float appliedPowerFactor = event.isLowPowerModeSet() ? event.powerFactor : -1f; float appliedPowerFactor = event.isLowPowerModeSet() ? event.powerFactor : -1f;
FrameworkStatsLog.write(FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED, if (mLogicalDisplay.getPrimaryDisplayDeviceLocked() != null
convertToNits(event.initialBrightness), && mLogicalDisplay.getPrimaryDisplayDeviceLocked()
convertToNits(event.brightness), .getDisplayDeviceInfoLocked().type == Display.TYPE_INTERNAL) {
event.slowAmbientLux, FrameworkStatsLog.write(FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED,
event.physicalDisplayId, convertToNits(event.initialBrightness),
event.isShortTermModelActive(), convertToNits(event.brightness),
appliedPowerFactor, event.slowAmbientLux,
appliedRbcStrength, event.physicalDisplayId,
appliedHbmMaxNits, event.isShortTermModelActive(),
appliedThermalCapNits, appliedPowerFactor,
event.automaticBrightnessEnabled, appliedRbcStrength,
FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__REASON__REASON_MANUAL); appliedHbmMaxNits,
appliedThermalCapNits,
event.automaticBrightnessEnabled,
FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__REASON__REASON_MANUAL);
}
} }
class BrightnessEvent { class BrightnessEvent {