tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Handle virtio in private fs mapping"

Browse source
This commit is contained in:
Treehugger Robot 2020-05-20 06:32:43 +00:00 committed by Gerrit Code Review
commit e471d11d46
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/PrivateVolume.cpp
View file

@ -38,6 +38,7 @@
#include <sys/wait.h> #include <sys/wait.h>
using android::base::StringPrintf; using android::base::StringPrintf;
using android::vold::IsVirtioBlkDevice;
namespace android { namespace android {
namespace vold { namespace vold {
@ -178,7 +179,8 @@ status_t PrivateVolume::doFormat(const std::string& fsType) {
if (fsType == "auto") { if (fsType == "auto") {
// For now, assume that all MMC devices are flash-based SD cards, and // For now, assume that all MMC devices are flash-based SD cards, and
// give everyone else ext4 because sysfs rotational isn't reliable. // give everyone else ext4 because sysfs rotational isn't reliable.
if ((major(mRawDevice) == kMajorBlockMmc) && f2fs::IsSupported()) { if ((major(mRawDevice) == kMajorBlockMmc ||
IsVirtioBlkDevice(major(mRawDevice))) && f2fs::IsSupported()) {
resolvedFsType = "f2fs"; resolvedFsType = "f2fs";
} else { } else {
resolvedFsType = "ext4"; resolvedFsType = "ext4";