diff options
| author | Tao Bao <tbao@google.com> | 2016-10-13 16:04:07 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2016-10-13 16:07:15 -0700 |
| commit | ee9b95544a7af548e98f2b7a080e2eb7abaaf981 (patch) | |
| tree | ce8d6b05ae34ac8b4102e7907b5d01f7b762fe30 /install.cpp | |
| parent | c5b4b719134a1d2d3b06a81f92a00b24e527248d (diff) | |
Fix the prefix matching for uncrypt status.
Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.
Test: Build and reboot into recovery image. Check last_log.
Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
Diffstat (limited to 'install.cpp')
| -rw-r--r-- | install.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install.cpp b/install.cpp index 427bea1a..72c922d5 100644 --- a/install.cpp +++ b/install.cpp @@ -377,8 +377,8 @@ 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_:")) { - PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; + } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) { + LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status; } else { log_buffer.push_back(android::base::Trim(uncrypt_status)); } |