commit 1709d22b4ec007da172e2d49ced99847c6f00225
author Tao Bao <tbao@google.com> Thu Oct 13 16:04:07 2016 -0700
committer Tao Bao <tbao@google.com> Fri Oct 14 18:07:47 2016 +0000
tree e8abe9c634ed821359ad3bf70a80170f9c7b3e52
parent 1b1a4edb4bc102706d6171901bb15f623adf2d2e

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
(cherry picked from commit ee9b95544a7af548e98f2b7a080e2eb7abaaf981)
(cherry picked from commit e30a5b3a44c6c2134750e28a88efd5876a28bfac)

install.cpp

diff --git a/install.cpp b/install.cpp
index 83ddc4b..aa1fe17 100644
--- a/install.cpp
+++ b/install.cpp
@@ -537,7 +537,7 @@
         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;
+            LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
         } else {
             log_buffer.push_back(android::base::Trim(uncrypt_status));
         }