summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-02-19 00:07:25 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-02-19 00:07:25 +0000
commit6fb9b930695a8d6daafed795e80d09ba91dd14d6 (patch)
treebe493cf511424f22339082ccd833534d4f8e7181
parentbcf476dece70933bd12b339b4e01e987bb7314b3 (diff)
parent7e4ce2b578b602e171d12dd59c66711b27d5ab73 (diff)
downloadcore-6fb9b930695a8d6daafed795e80d09ba91dd14d6.tar.gz
Snap for 7155236 from 7e4ce2b578b602e171d12dd59c66711b27d5ab73 to rvc-qpr3-releaseandroid-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-release
Change-Id: Ie93067f796b431b9d059517ebebeef647d87714a
-rw-r--r--init/mount_handler.cpp6
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));