Add disk for StubVolume StubVolume is a volume type for ARC++ external storage. Named StubVolume because it is managed from outside Android (not through Android kernel). Previously, StubVolume is a diskless volume. However, as mentioned in jsharkey@ email, a disk is needed for StubVolume to hold "kInternal" (external storage type that is "external" from Android perspective, but is "internal" to the device. For example shared directory from ChromeOS to Android) and "kIndexable" (whether or not a disk should be indexed by MediaStore). The addition of disk means we could expose the createStubVolume API to add a disk flags, which is also introduced in this CL. Both kInternal and kIndexable will be introduced in separate CL. Bug: 132796154 Test: Mount/unmount ARC++ removable device in ChromeOS. Change-Id: I8b77fa1cf50ab38a2892272154dafdb78f079378
diff --git a/VolumeManager.h b/VolumeManager.h index eb48736..992b6dc 100644 --- a/VolumeManager.h +++ b/VolumeManager.h
@@ -163,7 +163,7 @@ int createStubVolume(const std::string& sourcePath, const std::string& mountPath, const std::string& fsType, const std::string& fsUuid, - const std::string& fsLabel, std::string* outVolId); + const std::string& fsLabel, int32_t flags, std::string* outVolId); int destroyStubVolume(const std::string& volId); int mountAppFuse(uid_t uid, int mountId, android::base::unique_fd* device_fd); @@ -192,7 +192,6 @@ std::list<std::shared_ptr<android::vold::Disk>> mDisks; std::list<std::shared_ptr<android::vold::Disk>> mPendingDisks; std::list<std::shared_ptr<android::vold::VolumeBase>> mObbVolumes; - std::list<std::shared_ptr<android::vold::VolumeBase>> mStubVolumes; std::list<std::shared_ptr<android::vold::VolumeBase>> mInternalEmulatedVolumes; std::unordered_map<userid_t, int> mAddedUsers; @@ -205,7 +204,7 @@ std::shared_ptr<android::vold::VolumeBase> mPrimary; int mNextObbId; - int mNextStubVolumeId; + int mNextStubId; bool mSecureKeyguardShowing; };