commit 9da9fde2c182bd4815ce76c4bc3a2022ef9b12c7
author Bowgo Tsai <bowgotsai@google.com> Mon May 08 17:15:20 2017 +0800
committer Bowgo Tsai <bowgotsai@google.com> Tue May 09 09:02:55 2017 +0800
tree 05c3622c21a2f4cef91025a5e1197f7ac567730e
parent dcb30ba83951e7966d21c89377fbe88348191fc6

fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work

Should set verity mode to VERITY_MODE_DEFAULT when
androidboot.veritymode=enforcing.

Bug: 38103331
Test: `adb shell getprop partition.system.verified` returns 2 when veritymode=enforcing
Test: `adb shell getprop partition.vendor.verified` returns 2 when veritymode=enforcing

(cherry picked from commit 77cbfd6341a7a500fdb8e2f3cc4a4f721254f10e)

Merged-Id: I2f34eb6509f91989ce726e540cf2c0d353347ede
Change-Id: I2f34eb6509f91989ce726e540cf2c0d353347ede

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index 0bf173b..5fa10bc 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -663,7 +663,7 @@
     /* use the kernel parameter if set */
     std::string veritymode;
     if (fs_mgr_get_boot_config("veritymode", &veritymode)) {
-        if (veritymode.compare("enforcing")) {
+        if (veritymode == "enforcing") {
             *mode = VERITY_MODE_DEFAULT;
         }
         return 0;