diff options
author | Tianjie Xu | 2016-09-24 17:31:34 -0500 |
---|---|---|
committer | Tianjie Xu | 2016-09-27 00:48:45 -0500 |
commit | da44cf18f3ce4bbffa85ad0a50bb25e9cb54a86d (patch) | |
tree | 6afe76ad7ab69dd255f176b5a1a53d40793fad7e /install.cpp | |
parent | 95afc912fb4a30f3522facde0686597aa1505017 (diff) | |
download | platform-bootable-recovery-da44cf18f3ce4bbffa85ad0a50bb25e9cb54a86d.tar.gz platform-bootable-recovery-da44cf18f3ce4bbffa85ad0a50bb25e9cb54a86d.tar.xz platform-bootable-recovery-da44cf18f3ce4bbffa85ad0a50bb25e9cb54a86d.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
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp index 01b839ff..427bea1a 100644 --- a/install.cpp +++ b/install.cpp | |||
@@ -377,7 +377,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file, | |||
377 | std::string uncrypt_status; | 377 | std::string uncrypt_status; |
378 | if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) { | 378 | if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) { |
379 | PLOG(WARNING) << "failed to read uncrypt status"; | 379 | PLOG(WARNING) << "failed to read uncrypt status"; |
380 | } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_time:")) { | 380 | } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_:")) { |
381 | PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; | 381 | PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; |
382 | } else { | 382 | } else { |
383 | log_buffer.push_back(android::base::Trim(uncrypt_status)); | 383 | log_buffer.push_back(android::base::Trim(uncrypt_status)); |