summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-12-29 17:48:17 +0100
committerEthan Yonker <dees_troy@teamw.in>2015-01-02 17:22:58 +0100
commitdf7abac1a645949ded76418759236bc3b14f107e (patch)
treebad4df0115162eb099a9d4c8bcbe282023c018bd /partitionmanager.cpp
parentgui: remove dead build flag TWRP_SIMULATE_ACTIONS (diff)
downloadandroid_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar.gz
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar.bz2
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar.lz
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar.xz
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.tar.zst
android_bootable_recovery-df7abac1a645949ded76418759236bc3b14f107e.zip
Diffstat (limited to '')
-rw-r--r--partitionmanager.cpp55
1 files changed, 31 insertions, 24 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index ea61d57d7..5d0fb018e 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1903,8 +1903,6 @@ bool TWPartitionManager::Enable_MTP(void) {
}
//Launch MTP Responder
LOGINFO("Starting MTP\n");
- char vendor[PROPERTY_VALUE_MAX];
- char product[PROPERTY_VALUE_MAX];
int count = 0;
int mtppipe[2];
@@ -1914,14 +1912,20 @@ bool TWPartitionManager::Enable_MTP(void) {
return false;
}
- property_set("sys.usb.config", "none");
- property_get("usb.vendor", vendor, "18D1");
- property_get("usb.product.mtpadb", product, "4EE2");
- string vendorstr = vendor;
- string productstr = product;
- TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr);
- TWFunc::write_file("/sys/class/android_usb/android0/idProduct", productstr);
- property_set("sys.usb.config", "mtp,adb");
+ 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) {
+ 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.mtpadb", product, "4EE2");
+ string vendorstr = vendor;
+ string productstr = product;
+ TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr);
+ 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
@@ -1960,17 +1964,21 @@ bool TWPartitionManager::Enable_MTP(void) {
}
bool TWPartitionManager::Disable_MTP(void) {
+ char old_value[PROPERTY_VALUE_MAX];
+ property_get("sys.usb.config", old_value, "error");
+ 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");
+ string vendorstr = vendor;
+ string productstr = product;
+ TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr);
+ TWFunc::write_file("/sys/class/android_usb/android0/idProduct", productstr);
+ usleep(2000);
+ }
#ifdef TW_HAS_MTP
- 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");
- string vendorstr = vendor;
- string productstr = product;
- TWFunc::write_file("/sys/class/android_usb/android0/idVendor", vendorstr);
- TWFunc::write_file("/sys/class/android_usb/android0/idProduct", productstr);
- usleep(2000);
if (mtppid) {
LOGINFO("Disabling MTP\n");
int status;
@@ -1981,14 +1989,13 @@ bool TWPartitionManager::Disable_MTP(void) {
close(mtp_write_fd);
mtp_write_fd = -1;
}
+#endif
property_set("sys.usb.config", "adb");
+#ifdef TW_HAS_MTP
DataManager::SetValue("tw_mtp_enabled", 0);
return true;
-#else
- LOGERR("MTP support not included\n");
- DataManager::SetValue("tw_mtp_enabled", 0);
- return false;
#endif
+ return false;
}
TWPartition* TWPartitionManager::Find_Partition_By_MTP_Storage_ID(unsigned int Storage_ID) {