From 286289695bd9f10e1961ff2230a3515ff5acb51e Mon Sep 17 00:00:00 2001
From: RD Babiera <rdbabiera@google.com>
Date: Thu, 9 Mar 2023 22:07:44 +0000
Subject: [PATCH] USB: remove empty stats logging for compliance warnings

Removes a call to FrameworkStatsLog.write when mUsbPortStatus
is null or when compliance warnings array is empty.

Test: atest CtsStatsdAtomHostTestCases:UsbStatsTests
Bug: 269342794
Change-Id: I7f03b66c6c713d8b2afa7905a962a458cce285fe
---
 .../usb/java/com/android/server/usb/UsbPortManager.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/services/usb/java/com/android/server/usb/UsbPortManager.java b/services/usb/java/com/android/server/usb/UsbPortManager.java
index 1a1af3b929d11..2975e1e050f58 100644
--- a/services/usb/java/com/android/server/usb/UsbPortManager.java
+++ b/services/usb/java/com/android/server/usb/UsbPortManager.java
@@ -1362,12 +1362,10 @@ public class UsbPortManager implements IBinder.DeathRecipient {
         }
     }
 
-    // Need to create new version to prevent double counting existing stats due
-    // to new broadcast
     private void logToStatsdComplianceWarnings(PortInfo portInfo) {
-        if (portInfo.mUsbPortStatus == null) {
-            FrameworkStatsLog.write(FrameworkStatsLog.USB_COMPLIANCE_WARNINGS_REPORTED,
-                portInfo.mUsbPort.getId(), new int[0]);
+        // Don't report if there isn't anything to report
+        if (portInfo.mUsbPortStatus == null
+                || portInfo.mUsbPortStatus.getComplianceWarnings().length == 0) {
             return;
         }