ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit b2d79c5e48.

Bug: http://b/135753060
Test: treehugger
Change-Id: I2b1b2b7dfb7bab783e4ed40e295329525ceaa0dd
This commit is contained in:
Dan Albert 2019-06-24 14:36:01 -07:00
parent 2547f740ea
commit ba4684c2b2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/daemon/usb_ffs.cpp
View file

@ -257,7 +257,6 @@ bool open_functionfs(android::base::unique_fd* out_control, android::base::uniqu
} }
// Signal only when writing the descriptors to ffs // Signal only when writing the descriptors to ffs
android::base::SetProperty("sys.usb.ffs.ready", "1"); android::base::SetProperty("sys.usb.ffs.ready", "1");
*out_control = std::move(control);
} }
bulk_out.reset(adb_open(USB_FFS_ADB_OUT, O_RDONLY)); 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; return false;
} }
*out_control = std::move(control);
*out_bulk_in = std::move(bulk_in); *out_bulk_in = std::move(bulk_in);
*out_bulk_out = std::move(bulk_out); *out_bulk_out = std::move(bulk_out);
return true; return true;