commit 04658dc8310c38c188862a6db24aedd8e887ba95
author Josh Gao <jmgao@google.com> Tue Jun 04 19:31:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 19:31:37 2019 -0700
tree c2ec4b82cd3510160efe4ca9a1861b44efa9f951
parent 83cbb3c39db3515e9e3e4c2a4be80886ebf45b73
parent 2120faeea7516ae8e17577fbefc3a0b9b1ff0627

Merge changes I2d005e17,If2eec162,Icfd642e6 am: 2683d0a2ca
am: 961b03661a

Change-Id: I8a6957e1944389d2d6b162fdc8d97b430f353fbe

adb/daemon/usb_ffs.cpp

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