Revert "Don't create separate mount namespaces for pre-apexd processes"
This reverts commit 5ab1300481bdc6587139e3ab2bf96b675a8c4a01.
Reason: Breaks some 3p apps.
Bug: 122920047
Test: run the app, login.
Change-Id: Iec3347d7f35fbb6f32fd1192135a0cf87dc123a7
(cherry picked from commit 80aec3f0f016933159c5a9a29214a444ca60fafa)
diff --git a/init/service.cpp b/init/service.cpp
index f3eafe4..c25628e 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -990,18 +990,7 @@
LOG(FATAL) << "Service '" << name_ << "' could not enter namespaces: " << result.error();
}
- // b/122559956: mount namespace is not cloned for the devices that don't support
- // the update of bionic libraries via APEX. In that case, because the bionic
- // libraries in the runtime APEX and the bootstrap bionic libraries are
- // identical, it doesn't matter which libs are used. This is also to avoid the
- // bug in sdcardfs which is triggered when we have multiple mount namespaces
- // across vold and the others. BIONIC_UPDATABLE shall be true only for the
- // devices where kernel has the fix for the sdcardfs bug (see the commit message
- // for the fix).
- static bool bionic_updatable =
- android::base::GetBoolProperty("ro.apex.bionic_updatable", false);
-
- if (bionic_updatable && pre_apexd_) {
+ if (pre_apexd_) {
// pre-apexd process gets a private copy of the mount namespace.
// However, this does not mean that mount/unmount events are not
// shared across pre-apexd processes and post-apexd processes.
@@ -1028,8 +1017,7 @@
}
}
- // b/122559956: same as above
- if (bionic_updatable && pre_apexd_ && ServiceList::GetInstance().IsRuntimeAvailable()) {
+ if (pre_apexd_ && ServiceList::GetInstance().IsRuntimeAvailable()) {
if (auto result = SetUpPreApexdMounts(); !result) {
LOG(FATAL) << "Pre-apexd service '" << name_
<< "' could not setup the mount points: " << result.error();
