commit 8a6c77af470b10dbefe82e58f287349284b428a0
author Badhri Jagan Sridharan <badhri@google.com> Mon Jan 14 21:18:25 2019 -0800
committer Badhri Jagan Sridharan <badhri@google.com> Wed Jan 23 18:41:10 2019 -0800
tree 75d413d463a8a8f1aaef53e10182f273f9dad4f7
parent d1908a4a03b59e5928e7b389e627e7392c506494

Log USB contaminant status

01-14 21:15:26.223   895  1046 I statsd  : { uid(1000) 1547529326000000000 235342687348 (117)0x10000->port0[S] 0x20000->2[I]  }
01-14 21:15:51.719   895  1046 I statsd  : { uid(1000) 1547529351000000000 260838630045 (117)0x10000->port0[S] 0x20000->3[I]  }
01-14 21:16:51.729   895  1046 I statsd  : { uid(1000) 1547529411000000000 320847794877 (117)0x10000->port0[S] 0x20000->2[I]  }
01-14 21:17:00.552   895  1046 I statsd  : { uid(1000) 1547529420000000000 329671167943 (117)0x10000->port0[S] 0x20000->3[I]  }
01-14 21:18:00.560   895  1046 I statsd  : { uid(1000) 1547529480000000000 389679730223 (117)0x10000->port0[S] 0x20000->2[I]  }

Bug: 119642987
Bug: 122595032
Test: Manually tested by running: adb shell cmd stats print-logs,
adb logcat | grep statsd | grep \(117\)

Change-Id: Idf98e4e5dfc44133112c48999eff7cccfd14550d

stats/atoms.proto

diff --git a/stats/atoms.proto b/stats/atoms.proto
index 5a6c08d..21b03c4 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -34,6 +34,7 @@
 import "frameworks/base/core/proto/android/server/enums.proto";
 import "frameworks/base/core/proto/android/server/location/enums.proto";
 import "frameworks/base/core/proto/android/service/procstats_enum.proto";
+import "frameworks/base/core/proto/android/service/usb.proto";
 import "frameworks/base/core/proto/android/stats/enums.proto";
 import "frameworks/base/core/proto/android/stats/docsui/docsui_enums.proto";
 import "frameworks/base/core/proto/android/stats/launcher/launcher.proto";
@@ -207,6 +208,7 @@
         AttentionManagerServiceResultReported attention_manager_service_result_reported = 143;
         AdbConnectionChanged adb_connection_changed = 144;
         SpeechDspStatReported speech_dsp_stat_reported = 145;
+        UsbContaminantReported usb_contaminant_reported = 146;
     }
 
     // Pulled events will start at field 10000.
@@ -4537,3 +4539,13 @@
     optional int32 total_crash_count = 3;
     optional int32 total_recover_count = 4;
 }
+
+/**
+ * Logs USB connector contaminant status.
+ *
+ * Logged from: USB Service.
+ */
+message UsbContaminantReported {
+    optional string id = 1;
+    optional android.service.usb.ContaminantPresenceStatus status = 2;
+}

stats/enums/service/usb.proto

diff --git a/stats/enums/service/usb.proto b/stats/enums/service/usb.proto
index 00fae3d..367c540 100644
--- a/stats/enums/service/usb.proto
+++ b/stats/enums/service/usb.proto
@@ -228,6 +228,15 @@
     repeated Mode supported_modes = 2;
 }
 
+/* Same as android.hardware.usb.V1_2.Constants.ContaminantPresenceStatus */
+enum ContaminantPresenceStatus {
+    CONTAMINANT_STATUS_UNKNOWN = 0;
+    CONTAMINANT_STATUS_NOT_SUPPORTED = 1;
+    CONTAMINANT_STATUS_DISABLED = 2;
+    CONTAMINANT_STATUS_NOT_DETECTED = 3;
+    CONTAMINANT_STATUS_DETECTED = 4;
+}
+
 message UsbPortStatusProto {
     option (android.msg_privacy).dest = DEST_AUTOMATIC;
 
@@ -245,14 +254,6 @@
         DATA_ROLE_DEVICE = 2;
     }
 
-    /* Same as android.hardware.usb.V1_2.Constants.ContaminantPresenceStatus */
-    enum ContaminantPresenceStatus {
-        CONTAMINANT_STATUS_NOT_SUPPORTED = 0;
-        CONTAMINANT_STATUS_DISABLED = 1;
-        CONTAMINANT_STATUS_NOT_DETECTED = 2;
-        CONTAMINANT_STATUS_DETECTED = 3;
-    }
-
     optional bool connected = 1;
     optional UsbPortProto.Mode current_mode = 2;
     optional PowerRole power_role = 3;