commit ac95a2cc469bc3ca2342d0e66f53f63db9048c64
author Zimuzo Ezeozue <zezeozue@google.com> Tue Jan 28 11:04:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 28 11:04:35 2020 +0000
tree c260aaf5a2c3b12f34585cc4b2c42cf8cb33921f
parent db9eedad9331c2f32c15437985d82c938ddd3160
parent c9a2be4e3fb102bfb56f6384121d01b674b4f375

Merge "Allow external_storage or media_rw gid access /mnt/media_rw"

model/PublicVolume.cpp

diff --git a/model/PublicVolume.cpp b/model/PublicVolume.cpp
index b246c95..a0b3227 100644
--- a/model/PublicVolume.cpp
+++ b/model/PublicVolume.cpp
@@ -141,13 +141,14 @@
     }
 
     if (mFsType == "vfat") {
-        if (vfat::Mount(mDevPath, mRawPath, false, false, false, AID_MEDIA_RW, AID_MEDIA_RW, 0007,
-                        true)) {
+        if (vfat::Mount(mDevPath, mRawPath, false, false, false, AID_ROOT,
+                        (isVisible ? AID_MEDIA_RW : AID_EXTERNAL_STORAGE), 0007, true)) {
             PLOG(ERROR) << getId() << " failed to mount " << mDevPath;
             return -EIO;
         }
     } else if (mFsType == "exfat") {
-        if (exfat::Mount(mDevPath, mRawPath, AID_MEDIA_RW, AID_MEDIA_RW, 0007)) {
+        if (exfat::Mount(mDevPath, mRawPath, AID_ROOT,
+                         (isVisible ? AID_MEDIA_RW : AID_EXTERNAL_STORAGE), 0007)) {
             PLOG(ERROR) << getId() << " failed to mount " << mDevPath;
             return -EIO;
         }