Volumes know parent disks; unsupported disks.
This is cleaner and more direct than the reverse of having the disk
publish child volume membership. Rename state constants to match
public API. Add state representing bad removal. Make it clear that
volume flags are related to mounting.
Send new unsupported disk event when we finish scanning an entire
disk and have no meaningful volumes.
Bug: 19993667
Change-Id: I08a91452ff561171a484d1da5745293ec893aec0
diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index dc746cf..025d2eb 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -124,18 +124,23 @@
return -EIO;
}
- if (getFlags() & Flags::kPrimary) {
+ if (getMountFlags() & MountFlags::kPrimary) {
initAsecStage();
}
- // Only need to spin up FUSE when visible
- if (!(getFlags() & Flags::kVisible)) {
- return OK;
- }
-
// TODO: teach FUSE daemon to protect itself with user-specific GID
if (!(mFusePid = fork())) {
- if (getFlags() & Flags::kPrimary) {
+ if (!(getMountFlags() & MountFlags::kVisible)) {
+ // TODO: mount so that only system apps can access
+ if (execl(kFusePath, kFusePath,
+ "-u", "1023", // AID_MEDIA_RW
+ "-g", "1023", // AID_MEDIA_RW
+ mRawPath.c_str(),
+ mFusePath.c_str(),
+ NULL)) {
+ PLOG(ERROR) << "Failed to exec";
+ }
+ } else if (getMountFlags() & MountFlags::kPrimary) {
if (execl(kFusePath, kFusePath,
"-u", "1023", // AID_MEDIA_RW
"-g", "1023", // AID_MEDIA_RW