pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

am: ba4684c2b2

Change-Id: I030ce911424f7315cd3b9c4f299b4232ee81e9aa
This commit is contained in:
Dan Albert 2019-06-25 08:01:04 -07:00 committed by android-build-merger
parent 38bdc11d4b ba4684c2b2
commit 134c98814a
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

@ -299,7 +299,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));
@ -314,6 +313,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;