aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2016-09-24 17:31:34 -0500
committerTianjie Xu2016-09-29 13:27:46 -0500
commit68fc81e860ab58a5147a48093e57daab38ee84a3 (patch)
treea2e264ba51c1e6848306371a1123d4bd79fe7a85 /install.cpp
parentb0d0ee3c7db0dcbfc822935540c90cfd01cbf270 (diff)
downloadplatform-bootable-recovery-68fc81e860ab58a5147a48093e57daab38ee84a3.tar.gz
platform-bootable-recovery-68fc81e860ab58a5147a48093e57daab38ee84a3.tar.xz
platform-bootable-recovery-68fc81e860ab58a5147a48093e57daab38ee84a3.zip
Report uncrypt errors in details
Add the error codes for uncrypt and report the failure details in uncrypt_status. Test: uncrypt_error logs correctly in last_install Bug: 31603820 Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5 (cherry picked from commit 0c68675f5ae80cd669e0bf014a69689b6fe08eee)
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp
index 63ee299a..83ddc4b0 100644
--- a/install.cpp
+++ b/install.cpp
@@ -536,7 +536,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
536 std::string uncrypt_status; 536 std::string uncrypt_status;
537 if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) { 537 if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
538 PLOG(WARNING) << "failed to read uncrypt status"; 538 PLOG(WARNING) << "failed to read uncrypt status";
539 } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_:")) { 539 } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
540 PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; 540 PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
541 } else { 541 } else {
542 log_buffer.push_back(android::base::Trim(uncrypt_status)); 542 log_buffer.push_back(android::base::Trim(uncrypt_status));