commit 2b17b24ae5eccd6c472c06abde93b5b83950c658
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 18 00:05:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 00:05:12 2016 +0000
tree 021638587b8614ddaf65a41b38129cbb4034f7e4
parent a01ffc73ef65283fbe9152e70ce08e0c911cddc3
parent aced5d9e4e438ba478ce54f9217166b8ab7cc24f

Merge "Change StringValue to use std::string"

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 29b088d..b1473ba 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -5,7 +5,6 @@
     restorecon /postinstall
 
     start ueventd
-    start healthd
 
 on init
     export ANDROID_ROOT /system

install.cpp

diff --git a/install.cpp b/install.cpp
index 427bea1..72c922d 100644
--- a/install.cpp
+++ b/install.cpp
@@ -377,8 +377,8 @@
         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));
         }