PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573

Browse Source 
am: 705a4d72c8

Change-Id: Ie1f8e1c6ab9fddf1b355287f0c4e5fc0b2631441
(cherry picked from commit 2e797d9905)
This commit is contained in:
Tianjie Xu
2017-04-02 03:12:15 +00:00
parent 253e223799
commit 8dcbd1b399
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_verifier/update_verifier.cpp
+4 -3
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