Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8613dc02 authored by Ethan Yonker's avatar Ethan Yonker
Browse files

Fix handling of MTP fork/child process 

Change-Id: Iacd8a38d21e9c8b0dfafefbeb646f46cd3ba02a1
parent a1f38054

mtp/twrpMtp.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}

partitionmanager.cpp

+6 −1
Original line number Diff line number Diff line
@@ -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);