summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-04-04 03:15:54 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-04-04 03:15:54 +0200
commitbec8264c6fb0a87805e1955380a2808cd1f6ed7b (patch)
tree656946f5aef628dd805dfc9251a406fc0c306082
parentMerge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d (diff)
parentMerge "update_verifier: correct group in rc file" (diff)
downloadandroid_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar.gz
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar.bz2
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar.lz
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar.xz
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.tar.zst
android_bootable_recovery-bec8264c6fb0a87805e1955380a2808cd1f6ed7b.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 8b60c3ffd..808f2c055 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 0
service update_verifier /system/bin/update_verifier ${vold.decrypt}
user root
- class cache
+ group cache
priority -20
ioprio rt 0