commit 72005fd1e691e38e0cd82531369f669576490077
author Dhiraj Jadhav <dvj@google.com> Thu Feb 18 04:57:03 2021 +0000
committer Dhiraj Jadhav <dvj@google.com> Thu Feb 18 04:57:03 2021 +0000
tree 8bdb07ca116da5ce566166611bfaf6d8947fe053
parent ea9681e4cdf30340b583dc27cb6c6474926ddaee

Revert "Revert "Revert "Set a default ACL on /data/media/userId."""

This reverts commit ea9681e4cdf30340b583dc27cb6c6474926ddaee.

Reason for revert: storage Permission causing b/179362637 adb push to fail

Change-Id: Ibc1d8b5b685c22545b7e2d15de58059960b87e14

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 98797b2..d5648f7 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -136,8 +136,8 @@
 }
 
 // Sets a default ACL on the directory.
-status_t SetDefaultAcl(const std::string& path, mode_t mode, uid_t uid, gid_t gid,
-                       std::vector<gid_t> additionalGids) {
+int SetDefaultAcl(const std::string& path, mode_t mode, uid_t uid, gid_t gid,
+                  std::vector<gid_t> additionalGids) {
     if (IsSdcardfsUsed()) {
         // sdcardfs magically takes care of this
         return OK;