Add support for more expressive SD card permissions
We now run an sdcard fuse daemon on top of a physical SD card.
Add support for that.
Bug: 10330128
Change-Id: I6a291f861ccb0f2911c07cc8f659e2cec4e6d76c
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index f606b5b..1690a01 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -159,7 +159,7 @@
for (i = mVolumes->begin(); i != mVolumes->end(); ++i) {
char *buffer;
asprintf(&buffer, "%s %s %d",
- (*i)->getLabel(), (*i)->getMountpoint(),
+ (*i)->getLabel(), (*i)->getFuseMountpoint(),
(*i)->getState());
cli->sendMsg(ResponseCode::VolumeListResult, buffer, false);
free(buffer);
@@ -1054,7 +1054,7 @@
VolumeCollection::iterator i;
for (i = mVolumes->begin(); i != mVolumes->end(); ++i) {
- const char* mountPoint = (*i)->getMountpoint();
+ const char* mountPoint = (*i)->getFuseMountpoint();
if (!strncmp(fileName, mountPoint, strlen(mountPoint))) {
return *i;
}
@@ -1512,7 +1512,7 @@
for (i = mVolumes->begin(); i != mVolumes->end(); ++i) {
if (label[0] == '/') {
- if (!strcmp(label, (*i)->getMountpoint()))
+ if (!strcmp(label, (*i)->getFuseMountpoint()))
return (*i);
} else {
if (!strcmp(label, (*i)->getLabel()))
@@ -1570,7 +1570,7 @@
for (AsecIdCollection::iterator it = toUnmount.begin(); it != toUnmount.end(); ++it) {
ContainerData *cd = *it;
- SLOGI("Unmounting ASEC %s (dependant on %s)", cd->id, v->getMountpoint());
+ SLOGI("Unmounting ASEC %s (dependant on %s)", cd->id, v->getFuseMountpoint());
if (unmountObb(cd->id, force)) {
SLOGE("Failed to unmount OBB %s (%s)", cd->id, strerror(errno));
rc = -1;