commit 1044bd746807e87ff195e9bf2641f823f7c87e1a
author Josh Gao <jmgao@google.com> Tue Apr 07 11:08:07 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 07 11:08:07 2020 +0000
tree 816f5222f26f0622cdb0cdd1e181360ae59bff51
parent 9c9a91064f670e7ab87451fc447c3ce3f16b301a
parent c9c6ce7c9a9b497e8c246e5e61d25b4493753c89

Merge "Revert "Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor""" into rvc-dev

adb/daemon/usb_ffs.cpp

diff --git a/adb/daemon/usb_ffs.cpp b/adb/daemon/usb_ffs.cpp
index 7bd611b..e538ca8 100644
--- a/adb/daemon/usb_ffs.cpp
+++ b/adb/daemon/usb_ffs.cpp
@@ -300,7 +300,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));
@@ -315,6 +314,7 @@
         return false;
     }
 
+    *out_control = std::move(control);
     *out_bulk_in = std::move(bulk_in);
     *out_bulk_out = std::move(bulk_out);
     return true;