aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2016-09-27 16:25:26 -0500
committerandroid-build-merger2016-09-27 16:25:26 -0500
commitb0d0ee3c7db0dcbfc822935540c90cfd01cbf270 (patch)
tree63ae2ccb19df6da8bd0062dc81655569c1897be3 /install.cpp
parent772153b3c7fad7a1147290843d3d45f672ffa825 (diff)
parentfc887a8fbad8c2c557fa4af136e190011dcac1fe (diff)
downloadplatform-bootable-recovery-b0d0ee3c7db0dcbfc822935540c90cfd01cbf270.tar.gz
platform-bootable-recovery-b0d0ee3c7db0dcbfc822935540c90cfd01cbf270.tar.xz
platform-bootable-recovery-b0d0ee3c7db0dcbfc822935540c90cfd01cbf270.zip
Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61
am: fc887a8fba Change-Id: I5e83be10f4443c8b107821975b3506381fcbdf0c
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 9a83c488..63ee299a 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_time:")) { 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));