Reland "adb: daemon: Assign valid fd to usb_handle ep0 file descriptor"
This reverts commit ba4684c2b2
.
Bug: http://b/129283234
Test: manually unplugged/replugged
Change-Id: I9c8cfebe09b2855cab986068273a835a13247b77
This commit is contained in:
parent
e7e778bdef
commit
bfe3dac36d
1 changed files with 1 additions and 1 deletions
|
@ -299,6 +299,7 @@ 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));
|
||||
|
@ -313,7 +314,6 @@ 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;
|
||||
|
|
Loading…
Reference in a new issue