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

Commit 30721b3a authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "ART: Fix LOG_FATAL" am: 1330e553 

am: 4a463636

Change-Id: Ib757cfab45c52f493e4a04e0a5d3363623836498
parents 0bb75399 4a463636

cmds/installd/dexopt.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -1877,9 +1877,8 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
        const char* dex_metadata_path, const char* compilation_reason) {

        const char* dex_metadata_path, const char* compilation_reason) {

    CHECK(pkgname != nullptr);

    CHECK(pkgname != nullptr);

    CHECK(pkgname[0] != 0);

    CHECK(pkgname[0] != 0);

    if ((dexopt_flags & ~DEXOPT_MASK) != 0) {

    CHECK_EQ(dexopt_flags & ~DEXOPT_MASK, 0)

        LOG_FATAL("dexopt flags contains unknown fields\n");

        << "dexopt flags contains unknown fields: " << dexopt_flags;

    }





    if (!validate_dex_path_size(dex_path)) {

    if (!validate_dex_path_size(dex_path)) {

        return -1;

        return -1;

cmds/installd/installd_constants.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ constexpr int DEXOPT_MASK = 
    | DEXOPT_FORCE

    | DEXOPT_FORCE

    | DEXOPT_STORAGE_CE

    | DEXOPT_STORAGE_CE

    | DEXOPT_STORAGE_DE

    | DEXOPT_STORAGE_DE

    | DEXOPT_IDLE_BACKGROUND_JOB

    | DEXOPT_ENABLE_HIDDEN_API_CHECKS;

    | DEXOPT_ENABLE_HIDDEN_API_CHECKS;





// NOTE: keep in sync with StorageManager

// NOTE: keep in sync with StorageManager

cmds/installd/otapreopt.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,8 @@ static_assert(DEXOPT_STORAGE_DE == 1 << 8, "DEXOPT_STORAGE_DE unexpected."); 
static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10,

static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10,

        "DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected");

        "DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected");





static_assert(DEXOPT_MASK           == 0x5fe, "DEXOPT_MASK unexpected.");

static_assert(DEXOPT_MASK           == (0x5fe | DEXOPT_IDLE_BACKGROUND_JOB),

              "DEXOPT_MASK unexpected.");