PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" into nyc-mr2-dev-plus-aosp

Browse Source 
am: 49420e6c3d

Change-Id: Ice77b003eb914b615f7380b80e75fda998a903f5
This commit is contained in:
Tianjie Xu
2017-03-27 02:58:38 +00:00
committed by android-build-merger
parent e55215ffd5 49420e6c3d
commit e9d200fc3a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.cpp
+9 -5
View File
@@ -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.