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

Commit 2740bf14 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make installd log A/B missing artifacts" am: 7dad29dc am: f8a4c39c am: 9d46ae8d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd7ed34779b08689186fdacd724564da123af1ce
parents 0da68238 9d46ae8d

cmds/installd/dexopt.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -2112,8 +2112,9 @@ static bool move_ab_path(const std::string& b_path, const std::string& a_path) { 
    {

    {

        struct stat s;

        struct stat s;

        if (stat(b_path.c_str(), &s) != 0) {

        if (stat(b_path.c_str(), &s) != 0) {

            // Silently ignore for now. The service calling this isn't smart enough to understand

            // Ignore for now. The service calling this isn't smart enough to

            // lack of artifacts at the moment.

            // understand lack of artifacts at the moment.

            LOG(VERBOSE) << "A/B artifact " << b_path << " does not exist!";

            return false;

            return false;

        }

        }

        if (!S_ISREG(s.st_mode)) {

        if (!S_ISREG(s.st_mode)) {