commit df0619edea26c8f5e111048f0071ca24a07d2de6
author Tianjie Xu <xunchang@google.com> Mon Mar 27 05:15:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 27 05:15:40 2017 +0000
tree 77d754c15042102b12651ccf34c2eec3d2742250
parent b4c4f8c494c4e9bd559c9f16b799c0307bc8ac4a
parent a286778762b3ddb8ed043ae47d2bd069cd5b3573

Merge "Skip logging the warning for uncrypt_status for devices w/o /cache"

install.cpp

diff --git a/install.cpp b/install.cpp
index db8fb97..7cef44a 100644
--- a/install.cpp
+++ b/install.cpp
@@ -546,17 +546,21 @@
     std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
     int time_total = static_cast<int>(duration.count());
 
-    if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
+    bool has_cache = volume_for_path("/cache") != nullptr;
+    // Skip logging the uncrypt_status on devices without /cache.
+    if (has_cache) {
+      if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
         LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS;
-    } else {
+      } else {
         std::string uncrypt_status;
         if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
-            PLOG(WARNING) << "failed to read uncrypt status";
+          PLOG(WARNING) << "failed to read uncrypt status";
         } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
-            PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
+          LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
         } else {
-            log_buffer.push_back(android::base::Trim(uncrypt_status));
+          log_buffer.push_back(android::base::Trim(uncrypt_status));
         }
+      }
     }
 
     // The first two lines need to be the package name and install result.