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

Commit e07f0109 authored by Matt Mower's avatar Matt Mower
Browse files

Fix handling of USB config during MTP switching 

The property set of sys.usb.config was not part of the original 'Only
change USB mode to mtp when ready for MTP' commit. Further, it adds an
additional USB off/on toggle to the MTP startup routine, potentially
confusing the host computer. The default init.recovery.usb.rc already
sets the usb functions to 'adb' during 'on fs'.

It is possible that devices could run into issues with MTP startup due
to sys.usb.config not yet being set. This is actually due to a poor
design decision in Enable_MTP(), where sys.usb.config would not be
configured for mtp if sys.usb.config had never been set. It is not
necessary to check for a previous value, just set it.

Fix the USB PID for adb-only mode in Disable_MTP().

Change-Id: I21b5e64c9bdcd3104372a8b4eb8ea50cf4561892
parent 1b3fa22d

partitionmanager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -2092,8 +2092,8 @@ bool TWPartitionManager::Enable_MTP(void) { 
	}



	char old_value[PROPERTY_VALUE_MAX];

	property_get("sys.usb.config", old_value, "error");

	if (strcmp(old_value, "error") != 0 && strcmp(old_value, "mtp,adb") != 0) {

	property_get("sys.usb.config", old_value, "");

	if (strcmp(old_value, "mtp,adb") != 0) {

		char vendor[PROPERTY_VALUE_MAX];

		char product[PROPERTY_VALUE_MAX];

		property_set("sys.usb.config", "none");
@@ -2147,13 +2147,13 @@ void TWPartitionManager::Add_All_MTP_Storage(void) { 


bool TWPartitionManager::Disable_MTP(void) {

	char old_value[PROPERTY_VALUE_MAX];

	property_get("sys.usb.config", old_value, "error");

	property_get("sys.usb.config", old_value, "");

	if (strcmp(old_value, "adb") != 0) {

		char vendor[PROPERTY_VALUE_MAX];

		char product[PROPERTY_VALUE_MAX];

		property_set("sys.usb.config", "none");

		property_get("usb.vendor", vendor, "18D1");

		property_get("usb.product.adb", product, "D002");

		property_get("usb.product.adb", product, "D001");

		string vendorstr = vendor;

		string productstr = product;

		TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr);

twrp.cpp

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ int main(int argc, char **argv) { 
	property_get("mtp.crash_check", mtp_crash_check, "0");

	if (strcmp(mtp_crash_check, "0") == 0) {

		property_set("mtp.crash_check", "1");

		property_set("sys.usb.config", "adb"); // At first boot, should be adb-only

		if (DataManager::GetIntValue("tw_mtp_enabled") == 1 && ((DataManager::GetIntValue(TW_IS_ENCRYPTED) != 0 && DataManager::GetIntValue(TW_IS_DECRYPTED) != 0) || DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0)) {

			LOGINFO("Enabling MTP during startup\n");

			if (!PartitionManager.Enable_MTP())