diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /init/mount_handler.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'init/mount_handler.cpp')
| -rw-r--r-- | init/mount_handler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp index 01abba8d1..46f833104 100644 --- a/init/mount_handler.cpp +++ b/init/mount_handler.cpp @@ -130,7 +130,11 @@ void MountHandler::MountHandlerFunction() { char* buf = nullptr; size_t len = 0; while (getline(&buf, &len, fp_.get()) != -1) { - auto entry = ParseMount(std::string(buf)); + auto buf_string = std::string(buf); + if (buf_string.find("/emulated") != std::string::npos) { + continue; + } + auto entry = ParseMount(buf_string); auto match = untouched.find(entry); if (match == untouched.end()) { touched.emplace_back(std::move(entry)); |