Merge "Remove spamy log lines and set minimum severity to INFO"

2 files changed, 4 insertions, 7 deletions

diff --git a/apexd/apex_preinstalled_data.cpp b/apexd/apex_preinstalled_data.cpp
index 827566fb..a7b9f49d 100644
--- a/apexd/apex_preinstalled_data.cpp
+++ b/apexd/apex_preinstalled_data.cpp
@@ -59,14 +59,11 @@ Result<void> ApexPreinstalledData::ScanDir(const std::string& dir) {
 
     auto it = data_.find(name);
     if (it == data_.end()) {
-      LOG(INFO) << "Added " << apex_data.path << " ( " << name
-                << " ) to list of pre-installed apexes";
       data_[name] = apex_data;
     } else if (it->second.public_key != apex_data.public_key) {
-      return Error() << "Key for package " << name
-                     << " does not match with previously scanned key";
-    } else {
-      LOG(INFO) << apex_data.path << " ( " << name << " ) is already added";
+      return Error() << "Key for package " << apex_data.path << " ( " << name
+                     << ") does not match with previously scanned key from "
+                     << it->second.path;
     }
   }
   return {};
diff --git a/apexd/apexd_main.cpp b/apexd/apexd_main.cpp
index 3b0a1399..9e4220e7 100644
--- a/apexd/apexd_main.cpp
+++ b/apexd/apexd_main.cpp
@@ -102,7 +102,7 @@ void InstallSigtermSignalHandler() {
 int main(int /*argc*/, char** argv) {
   android::base::InitLogging(argv, &android::base::KernelLogger);
   // TODO(b/158468454): add a -v flag or an external setting to change severity.
-  android::base::SetMinimumLogSeverity(android::base::VERBOSE);
+  android::base::SetMinimumLogSeverity(android::base::INFO);
 
   // set umask to 022 so that files/dirs created are accessible to other
   // processes e.g.) apex-info-file.xml is supposed to be read by other