Revert "Set a default ACL on /data/media/userId."
This reverts commit a71323ec0ea0927464c7e6f62770ef43f649b3fb.
Reason for revert: b/177926359 - note that this is a Google testing infrastructure issue, and no issue with this patch. Partners can keep using this patch. It will be resubmitted in a few weeks.
Change-Id: Ia13279ac1aafa2e4425c4527aeadd5d0fadbc2e4
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index be51963..8f6ba9c 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -74,7 +74,6 @@
using android::vold::KeyGeneration;
using android::vold::retrieveKey;
using android::vold::retrieveOrGenerateKey;
-using android::vold::SetDefaultAcl;
using android::vold::SetQuotaInherit;
using android::vold::SetQuotaProjectId;
using android::vold::writeStringToFile;
@@ -868,15 +867,7 @@
if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
if (!prepare_dir(vendor_ce_path, 0771, AID_ROOT, AID_ROOT)) return false;
}
- if (!prepare_dir(media_ce_path, 02770, AID_MEDIA_RW, AID_MEDIA_RW)) return false;
- // On devices without sdcardfs (kernel 5.4+), the path permissions aren't fixed
- // up automatically; therefore, use a default ACL, to ensure apps with MEDIA_RW
- // can keep reading external storage; in particular, this allows app cloning
- // scenarios to work correctly on such devices.
- int ret = SetDefaultAcl(media_ce_path, 02770, AID_MEDIA_RW, AID_MEDIA_RW, {AID_MEDIA_RW});
- if (ret != android::OK) {
- return false;
- }
+ if (!prepare_dir(media_ce_path, 0770, AID_MEDIA_RW, AID_MEDIA_RW)) return false;
if (!prepare_dir(user_ce_path, 0771, AID_SYSTEM, AID_SYSTEM)) return false;