From 082542669d57ac8396048b6bad1cf246aa3f8262 Mon Sep 17 00:00:00 2001 From: Silvia Vinyes Date: Thu, 27 Oct 2022 11:13:32 +0000 Subject: Ensure only internal display display interactions are logged. Bug:236234158 Change-Id: I473867eb37ae6d862759ab1f4fad95bb7bb96616 Test: statsd_testdrive (cherry picked from commit fedad29a419d86555ad9ae22c69c864c55abff63) Merged-in: I473867eb37ae6d862759ab1f4fad95bb7bb96616 --- .../server/display/DisplayPowerController.java | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 69c890d90d03..36bff20e0d54 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -2810,18 +2810,22 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call float appliedPowerFactor = event.isLowPowerModeSet() ? event.powerFactor : -1f; - FrameworkStatsLog.write(FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED, - convertToNits(event.initialBrightness), - convertToNits(event.brightness), - event.slowAmbientLux, - event.physicalDisplayId, - event.isShortTermModelActive(), - appliedPowerFactor, - appliedRbcStrength, - appliedHbmMaxNits, - appliedThermalCapNits, - event.automaticBrightnessEnabled, - FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__REASON__REASON_MANUAL); + if (mLogicalDisplay.getPrimaryDisplayDeviceLocked() != null + && mLogicalDisplay.getPrimaryDisplayDeviceLocked() + .getDisplayDeviceInfoLocked().type == Display.TYPE_INTERNAL) { + FrameworkStatsLog.write(FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED, + convertToNits(event.initialBrightness), + convertToNits(event.brightness), + event.slowAmbientLux, + event.physicalDisplayId, + event.isShortTermModelActive(), + appliedPowerFactor, + appliedRbcStrength, + appliedHbmMaxNits, + appliedThermalCapNits, + event.automaticBrightnessEnabled, + FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__REASON__REASON_MANUAL); + } } class BrightnessEvent { -- cgit v1.2.3-59-g8ed1b