Merge "Fix the prefix matching for uncrypt status."
This commit is contained in:
+2
-2
@@ -377,8 +377,8 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
|
|||||||
std::string uncrypt_status;
|
std::string uncrypt_status;
|
||||||
if (!android::base::ReadFileToString(UNCRYPT_STATUS, &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_:")) {
|
} else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
|
||||||
PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
|
LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
|
||||||
} else {
|
} else {
|
||||||
log_buffer.push_back(android::base::Trim(uncrypt_status));
|
log_buffer.push_back(android::base::Trim(uncrypt_status));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user