Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4e60fe6 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Don't use LOG() in code that runs post-fork." am: c1476aae am: efd896cc am: 1b3e75a5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1763247

Change-Id: I6c419a840c796199db93bfe3e0c85d6f41c79c5f
parents c3901c43 1b3e75a5

cmds/installd/dexopt.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1371,10 +1371,12 @@ static SecondaryDexAccess check_secondary_dex_access(const std::string& dex_path 
        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;