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

Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61

Browse Source 
am: fc887a8fba

Change-Id: I5e83be10f4443c8b107821975b3506381fcbdf0c
This commit is contained in:
Tianjie Xu
2016-09-27 21:25:26 +00:00
committed by android-build-merger
parent 772153b3c7 fc887a8fba
commit b0d0ee3c7d
3 changed files with 88 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install.cpp
View File

@@ -536,7 +536,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
std::string uncrypt_status;
if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
PLOG(WARNING) << "failed to read uncrypt status";
} else if (!android::base::StartsWith(uncrypt_status, "uncrypt_time:")) {
} else if (!android::base::StartsWith(uncrypt_status, "uncrypt_:")) {
PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
} else {
log_buffer.push_back(android::base::Trim(uncrypt_status));