ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev

Browse source
This commit is contained in:
David Anderson 2019-06-22 00:07:56 +00:00 • committed by Android (Google) Code Review
commit e8d1fac1a6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -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;