commit 6fb9b930695a8d6daafed795e80d09ba91dd14d6
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 19 00:07:25 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 19 00:07:25 2021 +0000
tree be493cf511424f22339082ccd833534d4f8e7181
parent bcf476dece70933bd12b339b4e01e987bb7314b3
parent 7e4ce2b578b602e171d12dd59c66711b27d5ab73

Snap for 7155236 from 7e4ce2b578b602e171d12dd59c66711b27d5ab73 to rvc-qpr3-release

Change-Id: Ie93067f796b431b9d059517ebebeef647d87714a

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