ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fastbootd: Perform CRC check when flashing sparse images."

Browse source 
am: 950ec1a001

Change-Id: I426a059ff1a628ad09ae7f77815be6a51fd7e06f
This commit is contained in:
David Anderson 2018-09-05 15:21:04 -07:00 • committed by android-build-merger
commit f05d6cb4a7
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/device/flashing.cpp
View file

@ -72,7 +72,7 @@ int WriteCallback(void* priv, const void* data, size_t len) {
}
int FlashSparseData(int fd, std::vector<char>& downloaded_data) {
struct sparse_file* file = sparse_file_import_buf(downloaded_data.data(), true, false);
struct sparse_file* file = sparse_file_import_buf(downloaded_data.data(), true, true);
if (!file) {
return -ENOENT;
}

1
fastboot/fuzzy_fastboot/main.cpp
View file

@ -570,7 +570,6 @@ TEST_F(Conformance, SparseCRCCheck) {
buf.back() = buf.back() ^ 0x01;
ASSERT_EQ(DownloadCommand(buf.size()), SUCCESS) << "Device rejected download command";
ASSERT_EQ(SendBuffer(buf), SUCCESS) << "Downloading payload failed";
printf("%02x\n", (unsigned char)buf.back());
// It can either reject this download or reject it during flash
if (HandleResponse() != DEVICE_FAIL) {
EXPECT_EQ(fb->Flash("userdata"), DEVICE_FAIL)