tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This warning may cause confusion for users.

Bug: 36590598
Test: Warning line no longer shows for sailfish.
Change-Id: I277c87a50a72fdb499be790ee25b97f815d980be
(cherry picked from commit bcb5b18630f518835a0768535b43ccfe91683fc9)
This commit is contained in:
Tianjie Xu 2017-03-24 14:13:56 -07:00
parent 351f69e64a
commit 340e6762f8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
install.cpp
View file

@ -546,6 +546,9 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
std::chrono::duration<double> duration = std::chrono::system_clock::now() - start; std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
int time_total = static_cast<int>(duration.count()); int time_total = static_cast<int>(duration.count());
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) { if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS; LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS;
} else { } else {
@ -558,6 +561,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
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. // The first two lines need to be the package name and install result.
std::vector<std::string> log_header = { std::vector<std::string> log_header = {