(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/main.cpp b/main.cpp
index 5b1bdf7..b07ee68 100644
--- a/main.cpp
+++ b/main.cpp
@@ -72,10 +72,8 @@
ATRACE_BEGIN("main");
LOG(DEBUG) << "Detected support for:"
- << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "")
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
- << (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "")
<< (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
VolumeManager* vm;
@@ -260,17 +258,13 @@
}
if (entry.fs_mgr_flags.vold_managed) {
+ if (entry.fs_mgr_flags.nonremovable) {
+ LOG(WARNING) << "nonremovable no longer supported; ignoring volume";
+ continue;
+ }
+
std::string sysPattern(entry.blk_device);
- std::string fstype;
- if (!entry.fs_type.empty()) {
- fstype = entry.fs_type;
- }
- std::string mntopts;
- if (!entry.fs_options.empty()) {
- mntopts = entry.fs_options;
- }
std::string nickname(entry.label);
- int partnum = entry.partnum;
int flags = 0;
if (entry.is_encryptable()) {
@@ -281,13 +275,9 @@
android::base::GetBoolProperty("vold.debug.default_primary", false)) {
flags |= android::vold::Disk::Flags::kDefaultPrimary;
}
- if (entry.fs_mgr_flags.nonremovable) {
- flags |= android::vold::Disk::Flags::kNonRemovable;
- }
vm->addDiskSource(std::shared_ptr<VolumeManager::DiskSource>(
- new VolumeManager::DiskSource(sysPattern, nickname, partnum, flags,
- fstype, mntopts)));
+ new VolumeManager::DiskSource(sysPattern, nickname, flags)));
}
}
return 0;