aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2017-03-24 16:13:56 -0500
committerTianjie Xu2017-03-26 00:24:57 -0500
commita286778762b3ddb8ed043ae47d2bd069cd5b3573 (patch)
tree1fc71ae261aef6b2b46a15158eefe5093f921aa5 /install.cpp
parentb56a3c2e3afe1e9001e80358c66c66fe2775e42e (diff)
downloadplatform-bootable-recovery-a286778762b3ddb8ed043ae47d2bd069cd5b3573.tar.gz
platform-bootable-recovery-a286778762b3ddb8ed043ae47d2bd069cd5b3573.tar.xz
platform-bootable-recovery-a286778762b3ddb8ed043ae47d2bd069cd5b3573.zip
Skip logging the warning for uncrypt_status for devices w/o /cache
This warning may cause confusion for users. Bug: 36590598 Test: Warning line no longer shows for sailfish. Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be Merged-In: I277c87a50a72fdb499be790ee25b97f815d980be
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/install.cpp b/install.cpp
index db8fb97d..7cef44a3 100644
--- a/install.cpp
+++ b/install.cpp
@@ -546,17 +546,21 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
546 std::chrono::duration<double> duration = std::chrono::system_clock::now() - start; 546 std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
547 int time_total = static_cast<int>(duration.count()); 547 int time_total = static_cast<int>(duration.count());
548 548
549 if (ensure_path_mounted(UNCRYPT_STATUS) != 0) { 549 bool has_cache = volume_for_path("/cache") != nullptr;
550 // Skip logging the uncrypt_status on devices without /cache.
551 if (has_cache) {
552 if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
550 LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS; 553 LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS;
551 } else { 554 } else {
552 std::string uncrypt_status; 555 std::string uncrypt_status;
553 if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) { 556 if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
554 PLOG(WARNING) << "failed to read uncrypt status"; 557 PLOG(WARNING) << "failed to read uncrypt status";
555 } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) { 558 } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
556 PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; 559 LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
557 } else { 560 } else {
558 log_buffer.push_back(android::base::Trim(uncrypt_status)); 561 log_buffer.push_back(android::base::Trim(uncrypt_status));
559 } 562 }
563 }
560 } 564 }
561 565
562 // The first two lines need to be the package name and install result. 566 // The first two lines need to be the package name and install result.