commit b579e6bfb3b6ffbac2f18caf798d1c80082a263e
author Sami Tolvanen <samitolvanen@google.com> Mon Feb 29 09:07:46 2016 -0800
committer Sami Tolvanen <samitolvanen@google.com> Mon Feb 29 12:08:39 2016 -0800
tree 04fb11e82f0deb81983019b2f12298f1e855c937
parent 51c3468dbaabe39d8a9bae0b06c1ca74a2e28dd4

logd: stop log spam when integrity enforcement is suppressed

Bug: 27389331
Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c

logd/LogAudit.cpp

diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index 230dd11..9124bfd 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -99,11 +99,20 @@
 }
 
 void LogAudit::enforceIntegrity() {
+    static bool loggedOnce;
+    bool once = loggedOnce;
+
+    loggedOnce = true;
+
     if (!AUDITD_ENFORCE_INTEGRITY) {
-        logToDmesg("integrity enforcement suppressed; not rebooting");
+        if (!once) {
+            logToDmesg("integrity enforcement suppressed; not rebooting");
+        }
     } else if (rebootToSafeMode) {
         if (getProperty("persist.sys.safemode") == "1") {
-            logToDmesg("integrity enforcement suppressed; in safe mode");
+            if (!once) {
+                logToDmesg("integrity enforcement suppressed; in safe mode");
+            }
             return;
         }