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

Commit 831c3e2a authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Skip update verification if care_map is not found

am: da654af6

Change-Id: I67af9ecde49f72cbf4044ac1d5a9e10b911e8a93
parents fe6014ec da654af6
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -105,9 +105,12 @@ static bool read_blocks(const std::string& blk_device_prefix, const std::string&

static bool verify_image(const std::string& care_map_name) {
    android::base::unique_fd care_map_fd(TEMP_FAILURE_RETRY(open(care_map_name.c_str(), O_RDONLY)));
    // If the device is flashed before the current boot, it may not have care_map.txt
    // in /data/ota_package. To allow the device to continue booting in this situation,
    // we should print a warning and skip the block verification.
    if (care_map_fd.get() == -1) {
        SLOGE("Care map %s not found.\n", care_map_name.c_str());
        return false;
        SLOGI("Warning: care map %s not found.\n", care_map_name.c_str());
        return true;
    }
    // Care map file has four lines (two lines if vendor partition is not present):
    // First line has the block device name, e.g./dev/block/.../by-name/system.