summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-12-29 16:44:05 +0100
committerDees Troy <dees_troy@teamw.in>2014-12-29 17:01:41 +0100
commitabb5c4ead09e0e08e1d006fc76e7627df45c0281 (patch)
treed6419f12d5926aa3c884b4fb629077a66f5342e9
parentgui: fix DEVICE_RESOLUTION warnings in Android.mk (diff)
downloadandroid_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar.gz
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar.bz2
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar.lz
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar.xz
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.tar.zst
android_bootable_recovery-abb5c4ead09e0e08e1d006fc76e7627df45c0281.zip
-rwxr-xr-xmtp/mtp_MtpServer.cpp5
-rw-r--r--partitionmanager.cpp1
2 files changed, 5 insertions, 1 deletions
diff --git a/mtp/mtp_MtpServer.cpp b/mtp/mtp_MtpServer.cpp
index 96a1e9453..b53d07a8f 100755
--- a/mtp/mtp_MtpServer.cpp
+++ b/mtp/mtp_MtpServer.cpp
@@ -56,6 +56,11 @@ int twmtp_MtpServer::setup()
{
usePtp = false;
MyMtpDatabase* mtpdb = new MyMtpDatabase();
+ /* Sleep for a bit before we open the MTP USB device because some
+ * devices are not ready due to the kernel not responding to our
+ * sysfs requests right away.
+ */
+ usleep(800000);
#ifdef USB_MTP_DEVICE
#define STRINGIFY(x) #x
#define EXPAND(x) STRINGIFY(x)
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index be6674b88..ea61d57d7 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1922,7 +1922,6 @@ bool TWPartitionManager::Enable_MTP(void) {
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");
- usleep(2000); // Short sleep to prevent an occasional kernel panic on some devices
std::vector<TWPartition*>::iterator iter;
/* To enable MTP debug, use the twrp command line feature to
* twrp set tw_mtp_debug 1