summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-04-01 02:17:34 +0200
committerTom Cherry <tomcherry@google.com>2017-04-04 03:14:42 +0200
commit031f40704a323d2104cb09e97fb97a323ecf5f92 (patch)
tree605d8aa3673228a92f0c6558841af458c6f54800
parentMerge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 (diff)
downloadandroid_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar.gz
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar.bz2
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar.lz
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar.xz
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.tar.zst
android_bootable_recovery-031f40704a323d2104cb09e97fb97a323ecf5f92.zip
-rw-r--r--update_verifier/update_verifier.cpp2
-rw-r--r--update_verifier/update_verifier.rc4
2 files changed, 3 insertions, 3 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index 59f136c90..350020f13 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -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,
// we should print a warning and skip the block verification.
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;
}
// Care map file has four lines (two lines if vendor partition is not present):
diff --git a/update_verifier/update_verifier.rc b/update_verifier/update_verifier.rc
index fc8a64dee..75cfeb28d 100644
--- a/update_verifier/update_verifier.rc
+++ b/update_verifier/update_verifier.rc
@@ -1,11 +1,11 @@
service update_verifier_nonencrypted /system/bin/update_verifier nonencrypted
user root
- class cache
+ group cache
priority -20
ioprio rt 1
service update_verifier /system/bin/update_verifier ${vold.decrypt}
user root
- class cache
+ group cache
priority -20
ioprio rt 1 \ No newline at end of file