From 89e0429ce7ca39715fcdf950bf553ffe08a51b92 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Mon, 29 Feb 2016 09:07:46 -0800 Subject: [PATCH] logd: stop log spam when integrity enforcement is suppressed Bug: 27389331 Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c (cherry pick from commit abda9340e68d71c708e0ccd81909061b5162f065) --- logd/LogAudit.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp index 230dd1125..9124bfdfc 100644 --- a/logd/LogAudit.cpp +++ b/logd/LogAudit.cpp @@ -99,11 +99,20 @@ std::string LogAudit::getProperty(const std::string& name) } 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; }