commit 38af717a83456077189c9b2cb63ed76f083d6e43
author Mark Salyzyn <salyzyn@google.com> Wed Apr 10 14:41:51 2019 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Apr 11 09:48:45 2019 -0700
tree 9c7321ac5a6ad97152250a948bd3fc5537d25008
parent 54785507f01d3d8e923ff5aa168858415d66d7c1

fs_mgr: overlay: only use system_<other> if other slot suffix not blank

Test: adb-remount-test.sh
Bug: 129988285
Change-Id: Ib929d242e7cc4953096eb6300bcf7888ce2259ab

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 730d3db..4ac78e1 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -612,7 +612,9 @@
         if (!dm.GetDmDevicePathByName(partition_name, &path)) {
             // non-DAP A/B device?
             if (fs_mgr_access(super_device)) return "";
-            path = kPhysicalDevice + "system" + (slot_number ? "_a" : "_b");
+            auto other_slot = fs_mgr_get_other_slot_suffix();
+            if (other_slot.empty()) return "";
+            path = kPhysicalDevice + "system" + other_slot;
         }
     }
     return scratch_device_cache = path;