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

Commit e89fad4d authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "fastbootd: Fix partition size testing issues." 

am: 481e9a0a

Change-Id: I8526a139d6db0ecdd28ec16e352de8658c1e01a5
parents 7b6e44da 481e9a0a

fastboot/device/variables.cpp

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ bool GetPartitionSize(FastbootDevice* device, const std::vector<std::string>& ar 
        return false;

    }

    uint64_t size = get_block_device_size(handle.fd());

    *message = android::base::StringPrintf("%" PRIX64, size);

    *message = android::base::StringPrintf("0x%" PRIX64, size);

    return true;

}

fastboot/fuzzy_fastboot/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ TEST_F(Conformance, PartitionInfo) { 
            << "getvar:all did not report any partition-size: through INFO responses";

    std::set<std::string> allowed{"ext4", "f2fs", "raw"};

    for (const auto p : parts) {

        EXPECT_GT(std::get<1>(p), 0);

        EXPECT_GE(std::get<1>(p), 0);

        std::string part(std::get<0>(p));

        std::set<std::string> allowed{"ext4", "f2fs", "raw"};

        std::string resp;