diff options
| author | David Anderson <dvander@google.com> | 2019-06-21 17:36:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-21 17:36:16 -0700 |
| commit | b01de7fc763d4d9dca21d3f11c5894108289bc0c (patch) | |
| tree | 1bef90a0273e269fe793cd0bcc8a9a8601a76a88 | |
| parent | 5cffb8992e8bc99ab3757257e2dde5bf11286106 (diff) | |
| parent | e8d1fac1a67c7729d0793ba2c880d02dbb60fa8e (diff) | |
Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev
am: e8d1fac1a6
Change-Id: I8d2a6dcca3df75e44a67e8f7e184d52a6558e1a5
| -rw-r--r-- | fs_mgr/fs_mgr_overlayfs.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index c13c3b11d..0a6014d60 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp @@ -621,7 +621,9 @@ std::string fs_mgr_overlayfs_scratch_device() { 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; |