commit 37d7d67ca216972cba9259aa5866220d6abfaf14
author Tianjie Xu <xunchang@google.com> Sat Sep 24 15:31:34 2016 -0700
committer Tianjie Xu <xunchang@google.com> Thu Sep 29 18:06:04 2016 +0000
tree 535d8abf400b2fba9502fe05051376b94cd5807b
parent a8c0d0b43a2f46afeada2bf0960232b4b0890b07

DO NOT MERGE 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 da44cf18f3ce4bbffa85ad0a50bb25e9cb54a86d)

install.cpp

diff --git a/install.cpp b/install.cpp
index d8372e2..d30890a 100644
--- a/install.cpp
+++ b/install.cpp
@@ -532,7 +532,7 @@
         std::string uncrypt_status;
         if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
             LOGW("failed to read uncrypt status: %s\n", strerror(errno));
-        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_time:")) {
+        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
             LOGW("corrupted uncrypt_status: %s: %s\n", uncrypt_status.c_str(), strerror(errno));
         } else {
             log_buffer.push_back(android::base::Trim(uncrypt_status));