commit c4ea86d257921581a1d9df157328f99c35014973
author Dan Albert <danalbert@google.com> Tue Jun 25 08:01:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 25 08:01:04 2019 -0700
tree c8bf07acba86b19238d23bd36e534a097094d612
parent 2e863e9e9d17332be8675cd9131226ed31e64e1a
parent 753a371bdc1ca7ddca74ba69f98c7140c166c93a

Revert "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
am: ba4684c2b2

Change-Id: I030ce911424f7315cd3b9c4f299b4232ee81e9aa

adb/daemon/usb_ffs.cpp

diff --git a/adb/daemon/usb_ffs.cpp b/adb/daemon/usb_ffs.cpp
index a64ce40..338d776 100644
--- a/adb/daemon/usb_ffs.cpp
+++ b/adb/daemon/usb_ffs.cpp
@@ -299,7 +299,6 @@
         }
         // Signal only when writing the descriptors to ffs
         android::base::SetProperty("sys.usb.ffs.ready", "1");
-        *out_control = std::move(control);
     }
 
     bulk_out.reset(adb_open(USB_FFS_ADB_OUT, O_RDONLY));
@@ -314,6 +313,7 @@
         return false;
     }
 
+    *out_control = std::move(control);
     *out_bulk_in = std::move(bulk_in);
     *out_bulk_out = std::move(bulk_out);
     return true;