commit 68fc81e860ab58a5147a48093e57daab38ee84a3
author Tianjie Xu <xunchang@google.com> Sat Sep 24 15:31:34 2016 -0700
committer Tianjie Xu <xunchang@google.com> Thu Sep 29 11:27:46 2016 -0700
tree a2e264ba51c1e6848306371a1123d4bd79fe7a85
parent b0d0ee3c7db0dcbfc822935540c90cfd01cbf270

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)

install.cpp

diff --git a/install.cpp b/install.cpp
index 63ee299..83ddc4b 100644
--- a/install.cpp
+++ b/install.cpp
@@ -536,7 +536,7 @@
         std::string uncrypt_status;
         if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
             PLOG(WARNING) << "failed to read uncrypt status";
-        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_:")) {
+        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
             PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
         } else {
             log_buffer.push_back(android::base::Trim(uncrypt_status));