diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 15:28:02 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 15:28:02 +0000 |
| commit | 7c15037b1e41d1c3de2ca9c22ea31bc42ed03888 (patch) | |
| tree | b1b4dc64ac57a1ee5dce0882d30a1d72090357eb | |
| parent | 7973c1934f37513425b5b5b23ebebc4711fa4efe (diff) | |
| parent | dbccd591fffa32d51b2cf4664e8aa8bcb91b5657 (diff) | |
| download | recovery-7c15037b1e41d1c3de2ca9c22ea31bc42ed03888.tar.gz | |
Snap for 9710098 from dbccd591fffa32d51b2cf4664e8aa8bcb91b5657 to mainline-tzdata5-release
Change-Id: I315c048be39d206fb40bc103c7e150aa614eedea
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 6 | ||||
| -rw-r--r-- | update_verifier/update_verifier.cpp | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index 0a713eed..1ea56cd4 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -209,11 +209,7 @@ bool update_bootloader_message_in_struct(bootloader_message* boot, memset(boot->command, 0, sizeof(boot->command)); memset(boot->recovery, 0, sizeof(boot->recovery)); - if (android::base::GetBoolProperty("ro.boot.quiescent", false)) { - strlcpy(boot->command, "boot-recovery,quiescent", sizeof(boot->command)); - } else { - strlcpy(boot->command, "boot-recovery", sizeof(boot->command)); - } + strlcpy(boot->command, "boot-recovery", sizeof(boot->command)); std::string recovery = "recovery\n"; for (const auto& s : options) { diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index ea47a65c..a0160e2f 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -150,7 +150,6 @@ bool UpdateVerifier::ReadBlocks(const std::string partition_name, static constexpr size_t kBlockSize = 4096; std::vector<uint8_t> buf(1024 * kBlockSize); - size_t block_count = 0; for (const auto& [range_start, range_end] : group) { if (lseek64(fd.get(), static_cast<off64_t>(range_start) * kBlockSize, SEEK_SET) == -1) { PLOG(ERROR) << "lseek to " << range_start << " failed"; @@ -166,9 +165,7 @@ bool UpdateVerifier::ReadBlocks(const std::string partition_name, } remain -= to_read; } - block_count += (range_end - range_start); } - LOG(INFO) << "Finished reading " << block_count << " blocks on " << dm_block_device; return true; }; @@ -179,8 +176,8 @@ bool UpdateVerifier::ReadBlocks(const std::string partition_name, for (auto& t : threads) { ret = t.get() && ret; } - LOG(INFO) << "Finished reading blocks on " << dm_block_device << " with " << thread_num - << " threads."; + LOG(INFO) << "Finished reading blocks on partition " << partition_name << " @ " << dm_block_device + << " with " << thread_num << " threads."; return ret; } |