Changes for supporting UICC feature
To have UICC support with multiple sysfs entries with
the same volume label, one boolean flag is added to validate
the correct sysfs entry in fstab.qcom
Change-Id: Ic254e514db95fca82552fea3f9b09310ac09b33b
diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 3076d5a..93ea6e9 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -80,6 +80,7 @@
mDiskMinor = -1;
mDiskNumParts = 0;
mIsDecrypted = 0;
+ mIsValid = true;
if (strcmp(rec->mount_point, "auto") != 0) {
ALOGE("Vold managed volumes must have auto mount point; ignoring %s",
@@ -129,12 +130,38 @@
setState(Volume::State_Idle);
}
+int DirectVolume::getUICCVolumeNum(const char *dp) {
+ int mVolNum = -1;
+ if (strstr(dp, ":0:0:0"))
+ mVolNum = 0;
+ else if (strstr(dp, ":0:0:1"))
+ mVolNum = 1;
+
+ return mVolNum;
+}
+
int DirectVolume::handleBlockEvent(NetlinkEvent *evt) {
const char *dp = evt->findParam("DEVPATH");
PathCollection::iterator it;
for (it = mPaths->begin(); it != mPaths->end(); ++it) {
if ((*it)->match(dp)) {
+
+ /* Check for UICC prefix in label */
+ if (strstr(getLabel(), "uicc")) {
+ char mLabel[15];
+ int mNum = getUICCVolumeNum(dp);
+ if (mNum < 0) {
+ SLOGE("Invalid uicc volume number");
+ continue;
+ }
+
+ snprintf(mLabel, sizeof(mLabel), "uicc%d", mNum);
+ if (strncmp(getLabel(), mLabel, strlen(mLabel)) != 0)
+ continue;
+ }
+ setValidSysfs(true);
+
/* We can handle this disk */
int action = evt->getAction();
const char *devtype = evt->findParam("DEVTYPE");