summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2018-01-31 07:53:38 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2018-01-31 07:53:38 (GMT)
commitb9b423c496c3c70bdc64a4855be62b4d274ab538 (patch)
treed1353a38de056614c383f4063376abb0de5c55b8
parent99b34704afebdf2c4ae0eee2aeeaa25dbd016d1a (diff)
parentd5c78dd506172e25cb9dc486cec7db5e6f9d46b3 (diff)
downloaddroidvold-o-amlogic.zip
droidvold-o-amlogic.tar.gz
droidvold-o-amlogic.tar.bz2
Merge "droidvold: skip handle vfat udisks by default [1/1]" into o-amlogic
Diffstat
-rw-r--r--PublicVolume.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 1977f24..a389993 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -115,13 +115,18 @@ status_t PublicVolume::doMount() {
VolumeManager *vm = VolumeManager::Instance();
- //if (!mJustPhysicalDev && mFsType == "vfat") {
+
if (mFsType == "vfat") {
- sleep(2);
+#ifdef HAS_VFAT
+ sleep(5);
if (vm->isMountpointMounted(mRawPath.c_str())) {
LOG(DEBUG) << getId() << " vfat will handle by vold";
return 0;
}
+#else
+ LOG(DEBUG) << getId() << " vfat will handle by vold";
+ return 0;
+#endif
}
if (vm->isMountpointMounted(mRawPath.c_str())) {