commit 8f2dee04e2983262447a6aed2b662f4278ffeb4c
author jianjin <jianjin@google.com> Fri Mar 29 14:03:08 2019 -0700
committer jianjin <jianjin@google.com> Tue Apr 02 11:05:45 2019 -0700
tree ad9ae3d419a31d1a06ad34f8b9524c8f973ec33f
parent d5c80f29cd382f5c2b9332162e4a8f22e75260e1

Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred.

Bug: 126127632
Change-Id: I1e78069589185a4702d65cd026bc44b374a31f0a
Fix: 126127632
Test: none

cmds/statsd/src/atoms.proto

diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index d34b077..cadc3a0 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -257,6 +257,8 @@
         NetworkStackReported network_stack_reported = 182;
         AppMovedStorageReported app_moved_storage_reported = 183;
         BiometricEnrolled biometric_enrolled = 184;
+        SystemServerWatchdogOccurred system_server_watchdog_occurred = 185;
+        TombStoneOccurred tomb_stone_occurred = 186;
     }
 
     // Pulled events will start at field 10000.
@@ -3493,6 +3495,23 @@
     optional string package_name = 3;
 }
 
+/**
+ * Logs when system server watchdog occurs.
+ * Logged from:
+ *      frameworks/base/services/core/java/com/android/server/Watchdog.java
+ */
+message SystemServerWatchdogOccurred {
+    optional string subject = 1;
+}
+
+/**
+ * Logs when new file added to tombstones.
+ * Logged from:
+ *      frameworks/base/core/java/com/android/server/BootReceiver.java
+ */
+message TombStoneOccurred {
+}
+
 //////////////////////////////////////////////////////////////////////
 // Pulled atoms below this line //
 //////////////////////////////////////////////////////////////////////

core/java/com/android/server/BootReceiver.java

diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java
index 621d5a6..a087d68 100644
--- a/core/java/com/android/server/BootReceiver.java
+++ b/core/java/com/android/server/BootReceiver.java
@@ -267,6 +267,7 @@
                     if (file.isFile() && file.getName().startsWith("tombstone_")) {
                         addFileToDropBox(db, timestamps, headers, file.getPath(), LOG_SIZE,
                                 TAG_TOMBSTONE);
+                        StatsLog.write(StatsLog.TOMB_STONE_OCCURRED);
                     }
                 } catch (IOException e) {
                     Slog.e(TAG, "Can't log tombstone", e);

services/core/java/com/android/server/Watchdog.java

diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 1aeb689..afcf954 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -40,6 +40,7 @@
 import android.util.EventLog;
 import android.util.Log;
 import android.util.Slog;
+import android.util.StatsLog;
 
 import com.android.internal.os.ZygoteConnectionConstants;
 import com.android.server.am.ActivityManagerService;
@@ -539,6 +540,7 @@
                         mActivity.addErrorToDropBox(
                                 "watchdog", null, "system_server", null, null, null,
                                 subject, null, stack, null);
+                        StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject);
                     }
                 };
             dropboxThread.start();