summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-03-27 04:58:38 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 04:58:38 +0200
commite9d200fc3af860617eb25f6c72d2dc567291dce4 (patch)
tree13dac22defaf20a2db2bb3b14f5e6ac44ca9e448
parentMerge "applypatch: Drop the support for patching non-EMMC targets." am: b4c4f8c494 am: 351f69e64a (diff)
parentMerge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar.gz
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar.bz2
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar.lz
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar.xz
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.tar.zst
android_bootable_recovery-e9d200fc3af860617eb25f6c72d2dc567291dce4.zip
-rw-r--r--install.cpp14
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.