summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBadhri Jagan Sridharan <Badhri@google.com>2015-04-21 23:03:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-21 23:03:23 +0000
commit9805733d10d177548ced3439d81aed359dbc4bcb (patch)
tree37ad7cad9da1f5da8084ab9c3d6b6016435f775c
parent17441d879dc70346eb378e58101600ec3f480165 (diff)
parentfade90ac206c02623208bc8341f5164554593bf3 (diff)
downloadsystem_core-9805733d10d177548ced3439d81aed359dbc4bcb.zip
system_core-9805733d10d177548ced3439d81aed359dbc4bcb.tar.gz
system_core-9805733d10d177548ced3439d81aed359dbc4bcb.tar.bz2
am fade90ac: am 82b0f7ba: Merge "adb: set sys.usb.ffs.ready to signal usb pullup"
* commit 'fade90ac206c02623208bc8341f5164554593bf3': adb: set sys.usb.ffs.ready to signal usb pullup
-rw-r--r--adb/usb_linux_client.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/adb/usb_linux_client.cpp b/adb/usb_linux_client.cpp
index 343f20c..6d21104 100644
--- a/adb/usb_linux_client.cpp
+++ b/adb/usb_linux_client.cpp
@@ -18,6 +18,7 @@
#include "sysdeps.h"
+#include <cutils/properties.h>
#include <dirent.h>
#include <errno.h>
#include <linux/usb/ch9.h>
@@ -362,6 +363,7 @@ static void *usb_ffs_open_thread(void *x)
adb_sleep_ms(1000);
}
+ property_set("sys.usb.ffs.ready", "1");
D("[ usb_thread - registering device ]\n");
register_usb_transport(usb, 0, 0, 1);