commit f837af98071be37254468aa72612809720457c6b
author Badhri Jagan Sridharan <badhri@google.com> Wed Mar 08 19:49:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 08 19:49:57 2017 +0000
tree 969786fca906822511084609fa984bcbef15eefb
parent ae31fd48b073549cbd040f1cf243cd55997b724a
parent 796f76a534607d803350459b8b35241c8f2e201d

Merge "adb: Do not signal gaget stack unless descriptors are written" am: eab4c62e22 am: a37bc179de
am: 796f76a534

Change-Id: I85e68bcca4081915616bc6673bf67ca8d78757e8

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index c08b922..92e9039 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -283,6 +283,8 @@
             D("[ %s: writing strings failed: errno=%d]", USB_FFS_ADB_EP0, errno);
             goto err;
         }
+        //Signal only when writing the descriptors to ffs
+        android::base::SetProperty("sys.usb.ffs.ready", "1");
     }
 
     h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDWR);
@@ -358,7 +360,6 @@
             }
             std::this_thread::sleep_for(1s);
         }
-        android::base::SetProperty("sys.usb.ffs.ready", "1");
 
         D("[ usb_thread - registering device ]");
         register_usb_transport(usb, 0, 0, 1);