summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2019-04-02 22:17:39 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-02 22:17:39 -0700
commitfff6760db541344b58d09651e20c4b2f9db8513b (patch)
tree971b5282b6c8b3989624092f3291a90a1b91734b /adb
parentf080bf39d33131662bcf781d74a29f6885595a9c (diff)
parent0a2e8e94ae98c8b8da47fa200bfa0b2c0a4c8da9 (diff)
downloadsystem_core-fff6760db541344b58d09651e20c4b2f9db8513b.tar.gz
system_core-fff6760db541344b58d09651e20c4b2f9db8513b.tar.bz2
system_core-fff6760db541344b58d09651e20c4b2f9db8513b.zip
Merge "adb: fix mac build breakage." am: 52c6f1b6de am: 94a23604c7
am: 0a2e8e94ae Change-Id: Ic2966482db39cdb15eacb192606bca44b0fd5f6f
Diffstat (limited to 'adb')
-rw-r--r--adb/client/usb_osx.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/adb/client/usb_osx.cpp b/adb/client/usb_osx.cpp
index 381ded4bb..5c0da47f6 100644
--- a/adb/client/usb_osx.cpp
+++ b/adb/client/usb_osx.cpp
@@ -557,9 +557,7 @@ int usb_close(usb_handle *handle)
}
void usb_reset(usb_handle* handle) {
- if (!handle->dead) {
- (*handle->interface)->USBDeviceReEnumerate(handle->interface, 0);
- }
+ // Unimplemented on OS X.
usb_kick(handle);
}