(SQUASHED) Revert ext4/f2fs/ntfs support for external sdcards
----------
Revert "vold: Accept Linux GPT partitions on external SD cards"
- This reverts commit 4c9b0b10431e6b0ae9b2853b4f0e858c0459e43c.
Revert "Fix the group permissions of the sdcard root."
- This reverts commit c18032ad6b5ab204c7a83dc08a114814c7f16f50.
Revert "vold ext4/f2fs: do not use dirsync if we're mounting adopted storage"
- This reverts commit c0871375fcc398ca13cf325ab11e41b38f866b25.
Revert "vold: Mount ext4/f2fs portable storage with sdcard_posix"
- This reverts commit c28dd585e6f4efa2d5be0ef65be6d17f362f7cc6.
Revert "vold: Honor mount options for ext4/f2fs partitions"
- This reverts commit 9f8b4689157a6460f6f55b88f4ffb3511a6bbf3f.
Revert "vold: Support internal storage partitions"
- This reverts commit 34e1e5dbbd9509e9410bffacbc589b74d49d56ff.
Revert "vold: Fix fsck on public volumes"
- This reverts commit 779baf99cfa4590f7847d6c7c5f8a0697e085ab7.
Revert "vold: add support for more filesystems for public storage"
- This reverts commit 16cbb8dbc85db045c359c40fc29deacfa5146386.
----------
Change-Id: Ib0eb075545490e3cb7df73bfa9d55a51262fca6a
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/VolumeManager.h b/VolumeManager.h
index e664e49..a8117c9 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -37,7 +37,6 @@
#include "android/os/IVoldListener.h"
#include "model/Disk.h"
-#include "model/DiskPartition.h"
#include "model/VolumeBase.h"
class VolumeManager {
@@ -62,30 +61,20 @@
class DiskSource {
public:
- DiskSource(const std::string& sysPattern, const std::string& nickname,
- int partnum, int flags,
- const std::string& fstype, const std::string mntopts)
- : mSysPattern(sysPattern), mNickname(nickname),
- mPartNum(partnum), mFlags(flags),
- mFsType(fstype), mMntOpts(mntopts) {}
+ DiskSource(const std::string& sysPattern, const std::string& nickname, int flags)
+ : mSysPattern(sysPattern), mNickname(nickname), mFlags(flags) {}
bool matches(const std::string& sysPath) {
return !fnmatch(mSysPattern.c_str(), sysPath.c_str(), 0);
}
const std::string& getNickname() const { return mNickname; }
- int getPartNum() const { return mPartNum; }
int getFlags() const { return mFlags; }
- const std::string& getFsType() { return mFsType; }
- const std::string& getMntOpts() { return mMntOpts; }
private:
std::string mSysPattern;
std::string mNickname;
- int mPartNum;
int mFlags;
- std::string mFsType;
- std::string mMntOpts;
};
void addDiskSource(const std::shared_ptr<DiskSource>& diskSource);