Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34e13498 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "Do not umount roofs even if it is R/W." am: 43567e39 

am: 22782a72

Change-Id: I84024bff22fee8569c0f1193d6f3d8417d3cbc1b
parents eb7db75c 22782a72

init/reboot.cpp

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions, 
            std::string mount_dir(mentry->mnt_dir);

            // These are R/O partitions changed to R/W after adb remount.

            // Do not umount them as shutdown critical services may rely on them.

            if (mount_dir != "/system" && mount_dir != "/vendor" && mount_dir != "/oem") {

            if (mount_dir != "/" && mount_dir != "/system" && mount_dir != "/vendor" &&

                mount_dir != "/oem") {

                blockDevPartitions->emplace(blockDevPartitions->begin(), *mentry);

            }

        } else if (MountEntry::IsEmulatedDevice(*mentry)) {