Snap for 12755599 from 069138041ae7cce198ff522909e8db419afb7bb5 to 25Q1-release
Change-Id: Iea4871c65d33bfa89bf56e85fb9fa2b93d6041b8
diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index b2128a8..0f06c1f 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -45,6 +45,7 @@
namespace vold {
static const unsigned int kMajorBlockLoop = 7;
+static const unsigned int kMajorBlockHdd = 8;
static const unsigned int kMajorBlockMmc = 179;
PrivateVolume::PrivateVolume(dev_t device, const KeyBuffer& keyRaw)
@@ -218,6 +219,7 @@
// give everyone else ext4 because sysfs rotational isn't reliable.
// Additionally, prefer f2fs for loop-based devices
if ((major(mRawDevice) == kMajorBlockMmc ||
+ major(mRawDevice) == kMajorBlockHdd ||
major(mRawDevice) == kMajorBlockLoop ||
IsVirtioBlkDevice(major(mRawDevice))) && f2fs::IsSupported()) {
resolvedFsType = "f2fs";