commit c1476aae0b47c5b831f06724dcb9374ac8f1ce95
author Martijn Coenen <maco@google.com> Tue Jul 13 09:07:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 13 09:07:35 2021 +0000
tree 06e54686db594e738b07c8b7dad10229d528153f
parent 9aab31842ad22862b49c2401b654c56fe609c074
parent c417edf7525b32262666b4d0c55835f5bb0b9748

Merge "Don't use LOG() in code that runs post-fork."

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 9128542..210f977 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1371,10 +1371,12 @@
         return kSecondaryDexAccessReadOk;
     } else {
         if (errno == ENOENT) {
-            LOG(INFO) << "Secondary dex does not exist: " <<  dex_path;
+            async_safe_format_log(ANDROID_LOG_INFO, LOG_TAG,
+                    "Secondary dex does not exist: %s", dex_path.c_str());
             return kSecondaryDexAccessDoesNotExist;
         } else {
-            PLOG(ERROR) << "Could not access secondary dex " << dex_path;
+            async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG,
+                    "Could not access secondary dex: %s (%d)", dex_path.c_str(), errno);
             return errno == EACCES
                 ? kSecondaryDexAccessPermissionError
                 : kSecondaryDexAccessIOError;