commit cc0bb18d34bf8e61c702216ed7d09828bb63b9b1
author android-build-team Robot <android-build-team-robot@google.com> Mon Mar 22 20:56:37 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Mar 22 20:56:37 2021 +0000
tree be493cf511424f22339082ccd833534d4f8e7181
parent fc6feecad5eec04503789d525a5852b8fd7650c7
parent 4127965f58a8b80300f4a674468d369f759daca4

Snap for 7217438 from 4127965f58a8b80300f4a674468d369f759daca4 to rvc-platform-release

Change-Id: I2319eb8bf5931cfa48cca1c6db593125a973bf06

init/mount_handler.cpp

diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp
index 01abba8..46f8331 100644
--- a/init/mount_handler.cpp
+++ b/init/mount_handler.cpp
@@ -130,7 +130,11 @@
     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));