tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use regular check for partition name instead of CHECK()

Browse source 
Bug: 36260064
Test: Device reboots for invalid care_map.
Change-Id: Id614f0d118fc2b9d9abf24918aa4b4324f4c94e1
This commit is contained in:
Tianjie Xu 2017-03-31 16:36:12 -07:00
parent 21d481c81e
commit 5a176c0d3c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
update_verifier/update_verifier.cpp
View file

@ -74,9 +74,10 @@ static int dm_name_filter(const dirent* de) {
} }
static bool read_blocks(const std::string& partition, const std::string& range_str) { static bool read_blocks(const std::string& partition, const std::string& range_str) {
CHECK(partition == "system" || partition == "vendor") if (partition != "system" && partition != "vendor") {
<< "partition name should be system or vendor" << partition; LOG(ERROR) << "partition name must be system or vendor: " << partition;
return false;
}
// Iterate the content of "/sys/block/dm-X/dm/name". If it matches "system" // Iterate the content of "/sys/block/dm-X/dm/name". If it matches "system"
// (or "vendor"), then dm-X is a dm-wrapped system/vendor partition. // (or "vendor"), then dm-X is a dm-wrapped system/vendor partition.
// Afterwards, update_verifier will read every block on the care_map_file of // Afterwards, update_verifier will read every block on the care_map_file of