diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-03-27 04:56:27 +0200 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-27 04:56:28 +0200 |
| commit | 49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0 (patch) | |
| tree | f246f30951a48ea0cbb1afebd28bdd3e51be6710 /install.cpp | |
| parent | Merge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 (diff) | |
| parent | Skip logging the warning for uncrypt_status for devices w/o /cache (diff) | |
| download | android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar.gz android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar.bz2 android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar.lz android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar.xz android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.tar.zst android_bootable_recovery-49420e6c3d40dd0b154f993037a4d3ebcaa2f6d0.zip | |
Diffstat (limited to 'install.cpp')
| -rw-r--r-- | install.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/install.cpp b/install.cpp index a256d9b13..7cef44a37 100644 --- a/install.cpp +++ b/install.cpp @@ -546,17 +546,21 @@ install_package(const char* path, bool* wipe_cache, const char* install_file, 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_")) { - LOG(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. |