diff options
| -rwxr-xr-x | mtp/twrpMtp.cpp | 2 | ||||
| -rw-r--r-- | partitionmanager.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mtp/twrpMtp.cpp b/mtp/twrpMtp.cpp index e7c3f2cda..9a7df5be1 100755 --- a/mtp/twrpMtp.cpp +++ b/mtp/twrpMtp.cpp @@ -99,6 +99,8 @@ pid_t twrpMtp::forkserver(void) { if (pid == 0) { // Child process start(); + MTPD("MTP child process exited.\n"); + _exit(0); } else { return pid; } diff --git a/partitionmanager.cpp b/partitionmanager.cpp index bc27ccbcb..d83518b05 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -29,6 +29,7 @@ #include <fcntl.h> #include <iostream> #include <iomanip> +#include <sys/wait.h> #include "variables.h" #include "twcommon.h" #include "partitions.hpp" @@ -2212,8 +2213,12 @@ bool TWPartitionManager::Disable_MTP(void) { TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr); TWFunc::write_file("/sys/class/android_usb/android0/idProduct", productstr); if (mtppid) { - kill(mtppid, SIGTERM); + LOGINFO("Disabling MTP\n"); + int status; + kill(mtppid, SIGKILL); mtppid = 0; + // We don't care about the exit value, but this prevents a zombie process + waitpid(mtppid, &status, 0); } property_set("sys.usb.config", "adb"); DataManager::SetValue("tw_mtp_enabled", 0); |