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

Commit a8fdc6c6 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "[installd] Improve profile merging error logging" 

am: 781e508f

Change-Id: I229c83a464145ce66157a0afcda26f33defd2ed9
parents fbbbd1b3 781e508f

cmds/installd/dexopt.cpp

+12 −6
Original line number Original line Diff line number Diff line
@@ -708,12 +708,13 @@ static void open_profile_files(uid_t uid, const std::string& package_name, 
    }

    }

}

}





static constexpr int PROFMAN_BIN_RETURN_CODE_COMPILE = 0;

static constexpr int PROFMAN_BIN_RETURN_CODE_SUCCESS = 0;

static constexpr int PROFMAN_BIN_RETURN_CODE_SKIP_COMPILATION = 1;

static constexpr int PROFMAN_BIN_RETURN_CODE_COMPILE = 1;

static constexpr int PROFMAN_BIN_RETURN_CODE_BAD_PROFILES = 2;

static constexpr int PROFMAN_BIN_RETURN_CODE_SKIP_COMPILATION = 2;

static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_IO = 3;

static constexpr int PROFMAN_BIN_RETURN_CODE_BAD_PROFILES = 3;

static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_LOCKING = 4;

static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_IO = 4;

static constexpr int PROFMAN_BIN_RETURN_CODE_SUCCESS = 5;

static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_LOCKING = 5;

static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_DIFFERENT_VERSIONS = 6;





class RunProfman : public ExecVHelper {

class RunProfman : public ExecVHelper {

  public:

  public:
@@ -889,6 +890,11 @@ static bool analyze_profiles(uid_t uid, const std::string& package_name, 
                should_clear_current_profiles = false;

                should_clear_current_profiles = false;

                should_clear_reference_profile = false;

                should_clear_reference_profile = false;

                break;

                break;

            case PROFMAN_BIN_RETURN_CODE_ERROR_DIFFERENT_VERSIONS:

                need_to_compile = false;

                should_clear_current_profiles = true;

                should_clear_reference_profile = true;

                break;

           default:

           default:

                // Unknown return code or error. Unlink profiles.

                // Unknown return code or error. Unlink profiles.

                LOG(WARNING) << "Unexpected error code while processing profiles for location "

                LOG(WARNING) << "Unexpected error code while processing profiles for location "