commit 359e3a504fdef5709af8af21cd27e0414bb7375e
author Tianjie Xu <xunchang@google.com> Thu Oct 21 22:25:42 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 25 05:16:53 2021 +0000
tree 96a02fbd4a3ed182aab847eebb4871724d6c505c
parent cf80487ec21f05bc8d01ca4c0f13e69d04206437

Revert "Merge "Correct the permission of checkin dir" am: 9696432564 am: 5901afa842 am: e224d0827f am: e4f192efd3 am: da45b66919"

This reverts commit edfa6e8ccd1cdb01c68761db46877f645de35afe.

Needs for droidfood daily

Reason for revert: b/203742483

Change-Id: Ic5931ae784fefff355b37b5370afb108355c908a
(cherry picked from commit fb0377599d9f0b55b156590d5d0550d29c212c2e)

vold_prepare_subdirs.cpp

diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 862191c..ad4fa99 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -208,15 +208,11 @@
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/vold")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/storaged")) return false;
             if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/rollback")) return false;
+            if (!prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/checkin")) return false;
+
             // TODO: Return false if this returns false once sure this should succeed.
             prepare_dir(sehandle, 0700, 0, 0, misc_ce_path + "/apexrollback");
             prepare_apex_subdirs(sehandle, misc_ce_path);
-            // Give gmscore (who runs in cache group) access to the checkin directory. Also provide
-            // the user id to set the correct selinux mls_level.
-            if (!prepare_dir_for_user(sehandle, 0770, AID_SYSTEM, AID_CACHE,
-                                      misc_ce_path + "/checkin", user_id)) {
-                return false;
-            }
 
             auto system_ce_path = android::vold::BuildDataSystemCePath(user_id);
             if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, system_ce_path + "/backup")) {