commit ada9187ffdcd321281c5e5fb9f161c37161d7fa8
author Tej Singh <singhtejinder@google.com> Fri Jan 26 11:59:14 2018 -0800
committer Tej Singh <singhtejinder@google.com> Thu Feb 01 16:34:55 2018 -0800
tree 1ba0d3b1937b874af0bbe322aa9929cccbde0788
parent e301b9b3f9ce63b9ad64e834302b6eed4ccf430f

Atom: DaveyOccurred

Atom for davey occurred

Test: cts test accompanying && statsd unit tests && hwui unit tests
Change-Id: I715ac213b09ef2b3ef1de75bc456a5edf7e0a244

bin/src/atoms.proto

diff --git a/bin/src/atoms.proto b/bin/src/atoms.proto
index 4e570a6..cd24629 100644
--- a/bin/src/atoms.proto
+++ b/bin/src/atoms.proto
@@ -95,6 +95,7 @@
         AppStartMemoryStateCaptured app_start_memory_state_captured = 55;
         ShutdownSequenceReported shutdown_sequence_reported = 56;
         BootSequenceReported boot_sequence_reported = 57;
+        DaveyOccurred davey_occurred = 58;
         // TODO: Reorder the numbering so that the most frequent occur events occur in the first 15.
     }
 
@@ -721,6 +722,17 @@
 }
 
 /**
+ * Logs the duration of a davey (jank of >=700ms) when it occurs
+ *
+ * Logged from:
+ *   frameworks/base/libs/hwui/JankTracker.cpp
+ */
+message DaveyOccurred {
+    // Amount of time it took to render the frame. Should be >=700ms.
+    optional int64 jank_duration_ms = 1;
+}
+
+/**
  * Logs phone signal strength changes.
  *
  * Logged from:

bin/src/metrics/MetricsManager.cpp

diff --git a/bin/src/metrics/MetricsManager.cpp b/bin/src/metrics/MetricsManager.cpp
index d0737de..6362895 100644
--- a/bin/src/metrics/MetricsManager.cpp
+++ b/bin/src/metrics/MetricsManager.cpp
@@ -189,13 +189,7 @@
         return;
     }
 
-    if (event.GetTagId() != android::util::APP_HOOK) {
-        std::lock_guard<std::mutex> lock(mAllowedLogSourcesMutex);
-        if (mAllowedLogSources.find(event.GetUid()) == mAllowedLogSources.end()) {
-            VLOG("log source %d not on the whitelist", event.GetUid());
-            return;
-        }
-    } else { // Check that app hook fields are valid.
+    if (event.GetTagId() == android::util::APP_HOOK) { // Check that app hook fields are valid.
         // TODO: Find a way to make these checks easier to maintain if the app hooks get changed.
 
         // Label is 2nd from last field and must be from [0, 15].
@@ -211,6 +205,21 @@
             VLOG("App hook does not have valid state %ld", apphookState);
             return;
         }
+    } else if (event.GetTagId() == android::util::DAVEY_OCCURRED) {
+        // Daveys can be logged from any app since they are logged in libs/hwui/JankTracker.cpp.
+        // Check that the davey duration is reasonable. Max length check is for privacy.
+        status_t err = NO_ERROR;
+        long duration = event.GetLong(event.size(), &err);
+        if (err != NO_ERROR || duration > 100000) {
+            VLOG("Davey duration is unreasonably long: %ld", duration);
+            return;
+        }
+    } else {
+        std::lock_guard<std::mutex> lock(mAllowedLogSourcesMutex);
+        if (mAllowedLogSources.find(event.GetUid()) == mAllowedLogSources.end()) {
+            VLOG("log source %d not on the whitelist", event.GetUid());
+            return;
+        }
     }
 
     int tagId = event.GetTagId();