Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev

This commit is contained in:
Silvia Vinyes
2022-11-11 13:58:23 +00:00
committed by Android (Google) Code Review

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 {