Commit: 5dd50fdb9c9386371d3ebafacb04c0270a80d455 - system-core (git)

system/core

Commit MetaInfo

• Revision: 5dd50fdb9c9386371d3ebafacb04c0270a80d455 (tree)
• Time: 2019-06-25 08:30:43
• Author: Dan Albert <danalbert@goog...>
• Commiter: android-build-merger

Log Message

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

Change-Id: Idd32e4c28031b07cda09477b819d4bce0434b4fb

Change Summary

• modified: adb/daemon/usb_ffs.cpp

Incremental Difference

--- a/adb/daemon/usb_ffs.cpp
+++ b/adb/daemon/usb_ffs.cpp
@@ -257,7 +257,6 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu
         }
         // 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));
@@ -272,6 +271,7 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu
         return false;
     }
 
+    *out_control = std::move(control);
     *out_bulk_in = std::move(bulk_in);
     *out_bulk_out = std::move(bulk_out);
     return true;