commit 751f337f1481cb2c470f8d7d4e4c874dc7468e62
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 30 03:32:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 30 03:32:01 2019 +0000
tree 2358b2198b448e2a4a1c5d3fc0419e058978fcc5
parent 8ecc2ccc3d365c1f015c596d72f54a23a8fd58e4
parent 6896e20ae1d3ca9d48f9686f34443190f98e49d8

Merge "dmctl: suspend and resume devices"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index ac15ce4..2f0bf7d 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1009,7 +1009,7 @@
     Fstab candidates;
     for (const auto& entry : fstab) {
         FstabEntry new_entry = entry;
-        if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) &&
+        if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) ||
             !fs_mgr_wants_overlayfs(&new_entry)) {
             continue;
         }

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index c12e3b2..8797ea9 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -1060,7 +1060,7 @@
     if (sRetrofitDap.has_value()) {
         return *sRetrofitDap;
     }
-    return !android::base::GetBoolProperty("ro.boot.dynamic_partitions_retrofit", false);
+    return android::base::GetBoolProperty("ro.boot.dynamic_partitions_retrofit", false);
 }
 
 bool MetadataBuilder::IsRetrofitMetadata() const {