commit 884e06e2072fca2992397a3abbfdd6b71de2e189
author Mark Salyzyn <salyzyn@google.com> Wed Apr 10 14:41:51 2019 -0700
committer David Anderson <dvander@google.com> Fri Jun 21 10:52:58 2019 -0700
tree 0d17885c6d40de64e929ac118faabace046c9e37
parent 873c123d18e16fd814bbc3c0a9cdb394f46718bf

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

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

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index c13c3b1..0a6014d 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -621,7 +621,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;