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

update_verifier: correct group in rc file

Browse source 
update_verifier should be in the cache group, not 'class'.

Also use PLOG instead of LOG if care_map.txt cannot be opened.

Bug: 36818743
Test: boot sailfish
Test: fake OTA on sailfish and verify update_verifier reads care_package
Change-Id: I0ec844cac5ef5c63b18ebee90160854fd84ee829
This commit is contained in:
Tom Cherry 2017-03-31 17:17:34 -07:00
parent b6609f8895
commit 3a8002f8c0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
update_verifier/update_verifier.cpp
View file

@ -167,7 +167,7 @@ static bool verify_image(const std::string& care_map_name) {
// in /data/ota_package. To allow the device to continue booting in this situation, // in /data/ota_package. To allow the device to continue booting in this situation,
// we should print a warning and skip the block verification. // we should print a warning and skip the block verification.
if (care_map_fd.get() == -1) { if (care_map_fd.get() == -1) {
LOG(WARNING) << "Warning: care map " << care_map_name << " not found."; PLOG(WARNING) << "Failed to open " << care_map_name;
return true; return true;
} }
// Care map file has four lines (two lines if vendor partition is not present): // Care map file has four lines (two lines if vendor partition is not present):

4
update_verifier/update_verifier.rc
View file

@ -1,11 +1,11 @@
service update_verifier_nonencrypted /system/bin/update_verifier nonencrypted service update_verifier_nonencrypted /system/bin/update_verifier nonencrypted
user root user root
class cache group cache
priority -20 priority -20
ioprio rt 1 ioprio rt 1
service update_verifier /system/bin/update_verifier ${vold.decrypt} service update_verifier /system/bin/update_verifier ${vold.decrypt}
user root user root
class cache group cache
priority -20 priority -20
ioprio rt 1 ioprio rt 1