commit 85af6172bd1715f58e279d73d229c3f327abb024
author Dan Albert <danalbert@google.com> Tue Jun 25 08:19:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 25 08:19:12 2019 -0700
tree c8bf07acba86b19238d23bd36e534a097094d612
parent 2053e6d699067b79957b6e6399c1f3d423f929ca
parent 38bdc11d4b9f09b240b7fc0d395bd67c585814a9

Revert "adb: turn CHECKs into an error + transport restart." am: 2547f740ea
am: 38bdc11d4b

Change-Id: Idcb93706d2027421896792934595db09a1066525

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;