From 37d7d67ca216972cba9259aa5866220d6abfaf14 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Sat, 24 Sep 2016 15:31:34 -0700 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install.cpp') diff --git a/install.cpp b/install.cpp index d8372e276..d30890a9e 100644 --- a/install.cpp +++ b/install.cpp @@ -532,7 +532,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file, 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)); -- cgit v1.2.3