commit d6576491fefec9a22e73e38566a54816e2af097d
author Bowgo Tsai <bowgotsai@google.com> Mon May 08 15:34:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 15:34:42 2017 +0000
tree e2c368008a3f0db25be36fb9cd2a4efeff8aabff
parent c27f7911b1493349180a1dadc7eb20ae3b5a9a1c
parent 4dd17998ed216d7f8a6a55f8559a3f70a3fa9897

Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" am: 6019991c6e
am: 4dd17998ed

Change-Id: I9e1cd04d0e324e58dfced430e10cb50a5ce24f21

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;