diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-03-31 17:17:34 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-04-03 16:31:16 -0700 |
| commit | 3a8002f8c0382894b65ea3cece784287a75c7881 (patch) | |
| tree | 32c6a4967632743e099599bb21062f74cbe04ddc /update_verifier | |
| parent | b6609f8895029d07a57bdb2a2edc91a72d847927 (diff) | |
update_verifier: correct group in rc file
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
Diffstat (limited to 'update_verifier')
| -rw-r--r-- | update_verifier/update_verifier.cpp | 2 | ||||
| -rw-r--r-- | update_verifier/update_verifier.rc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index 59f136c9..350020f1 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 fc8a64de..75cfeb28 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 |