commit 147016d6e3b06cf82c5c6264fffa8d32bf1b7dda
author Bo Hu <bohu@google.com> Fri Jun 07 08:36:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 07 08:36:41 2019 -0700
tree 51dd5420b4e2ba67c9fa47571780f710ac9f0773
parent 1f55ffbc79f189175083761eb69c1303a7024d09
parent 46be2c5856874ea45f59fc46a2c50004e9c15767

Merge "fs_mgr: Don't report 'Skip mounting partitions'" am: f17902b392
am: b00b6876d9

Change-Id: I09149e24fc5eb22b7218904a0921726c378c2ef2

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 0cbdcce..b6c65da 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -714,6 +714,7 @@
                                  [&skip_mount_point](const auto& entry) {
                                      return entry.mount_point == skip_mount_point;
                                  });
+        if (it == fstab->end()) continue;
         fstab->erase(it, fstab->end());
         LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
     }