Merge "Fix signed issue with hex conversion." into mnc-dev
diff --git a/CommandListener.cpp b/CommandListener.cpp
index 5021fb1..ec3739c 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -199,14 +199,14 @@
int mountFlags = (argc > 3) ? atoi(argv[3]) : 0;
userid_t mountUserId = (argc > 4) ? atoi(argv[4]) : -1;
- if (mountFlags & android::vold::VolumeBase::MountFlags::kPrimary) {
- vm->setPrimary(vol);
- }
-
vol->setMountFlags(mountFlags);
vol->setMountUserId(mountUserId);
- return sendGenericOkFail(cli, vol->mount());
+ int res = vol->mount();
+ if (mountFlags & android::vold::VolumeBase::MountFlags::kPrimary) {
+ vm->setPrimary(vol);
+ }
+ return sendGenericOkFail(cli, res);
} else if (cmd == "unmount" && argc > 2) {
// unmount [volId]
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 5c4f9af..8f73e63 100755
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -379,6 +379,7 @@
SLOGW("Failed to unlink %s: %s", target.c_str(), strerror(errno));
}
}
+ LOG(DEBUG) << "Linking " << source << " to " << target;
if (TEMP_FAILURE_RETRY(symlink(source.c_str(), target.c_str()))) {
SLOGW("Failed to link %s to %s: %s", source.c_str(), target.c_str(),
strerror(errno));
diff --git a/main.cpp b/main.cpp
index 64cd0ee..ed2a88a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -84,6 +84,10 @@
exit(1);
}
+ if (property_get_bool("vold.debug", false)) {
+ vm->setDebug(true);
+ }
+
cl = new CommandListener();
vm->setBroadcaster((SocketListener *) cl);
nm->setBroadcaster((SocketListener *) cl);