PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MTP: make MTP work even if unplugged and replugged

Browse Source 
Set up a loop to keep trying to open / read the MTP device so that
MTP will work even if the device is unplugged during boot or
unplugged and replugged in.

Change-Id: I0d3a3b7c91ce84a8cbed16caa4b15efee35b3641
This commit is contained in:
Ethan Yonker
2015-01-30 10:08:48 -06:00
committed by Dees Troy
parent 1a7ba9751f
commit 1b03920ca7
6 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
partitionmanager.cpp
+26 -24
View File
@@ -1945,7 +1945,6 @@ bool TWPartitionManager::Enable_MTP(void) {
}
//Launch MTP Responder
LOGINFO("Starting MTP\n");
int count = 0;
int mtppipe[2];
@@ -1968,36 +1967,23 @@ bool TWPartitionManager::Enable_MTP(void) {
TWFunc::write_file("/sys/class/android_usb/android0/idProduct", productstr);
property_set("sys.usb.config", "mtp,adb");
}
std::vector<TWPartition*>::iterator iter;
/* To enable MTP debug, use the twrp command line feature to
* twrp set tw_mtp_debug 1
*/
twrpMtp *mtp = new twrpMtp(DataManager::GetIntValue("tw_mtp_debug"));
for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
if ((*iter)->Is_Storage && (*iter)->Is_Present && (*iter)->Mount(false)) {
printf("twrp addStorage %s, mtpstorageid: %u, maxFileSize: %lld\n", (*iter)->Storage_Path.c_str(), (*iter)->MTP_Storage_ID, (*iter)->Get_Max_FileSize());
mtp->addStorage((*iter)->Storage_Name, (*iter)->Storage_Path, (*iter)->MTP_Storage_ID, (*iter)->Get_Max_FileSize());
count++;
}
}
if (count) {
mtppid = mtp->forkserver(mtppipe);
if (mtppid) {
close(mtppipe[0]); // Host closes read side
mtp_write_fd = mtppipe[1];
DataManager::SetValue("tw_mtp_enabled", 1);
return true;
} else {
close(mtppipe[0]);
close(mtppipe[1]);
LOGERR("Failed to enable MTP\n");
return false;
}
mtppid = mtp->forkserver(mtppipe);
if (mtppid) {
close(mtppipe[0]); // Host closes read side
mtp_write_fd = mtppipe[1];
DataManager::SetValue("tw_mtp_enabled", 1);
Add_All_MTP_Storage();
return true;
} else {
close(mtppipe[0]);
close(mtppipe[1]);
LOGERR("Failed to enable MTP\n");
return false;
}
LOGERR("No valid storage partitions found for MTP.\n");
#else
LOGERR("MTP support not included\n");
#endif
@@ -2005,6 +1991,22 @@ bool TWPartitionManager::Enable_MTP(void) {
return false;
}
void TWPartitionManager::Add_All_MTP_Storage(void) {
#ifdef TW_HAS_MTP
std::vector<TWPartition*>::iterator iter;
if (!mtppid)
return; // MTP is not enabled
for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
if ((*iter)->Is_Storage && (*iter)->Is_Present && (*iter)->Mount(false))
Add_Remove_MTP_Storage((*iter), MTP_MESSAGE_ADD_STORAGE);
}
#else
return;
#endif
}
bool TWPartitionManager::Disable_MTP(void) {
char old_value[PROPERTY_VALUE_MAX];
property_get("sys.usb.config", old_value, "error");
@@ -2082,7 +2084,7 @@ bool TWPartitionManager::Add_Remove_MTP_Storage(TWPartition* Part, int message_t
mtp_message.path = Part->Storage_Path.c_str();
mtp_message.display = Part->Storage_Name.c_str();
mtp_message.maxFileSize = Part->Get_Max_FileSize();
LOGINFO("sending message to add %i '%s'\n", Part->MTP_Storage_ID, mtp_message.path);
LOGINFO("sending message to add %i '%s' '%s'\n", mtp_message.storage_id, mtp_message.path, mtp_message.display);
if (write(mtp_write_fd, &mtp_message, sizeof(mtp_message)) <= 0) {
LOGINFO("error sending message to add storage %i\n", Part->MTP_Storage_ID);
return false;