Merge changes Ibb109618,If1451871
* changes: adb: flush stderr after logging on Windows. adb: libusb: don't set interface alternate setting.
This commit is contained in:
commit
d08b470e25
2 changed files with 5 additions and 7 deletions
|
@ -41,6 +41,11 @@ void AdbLogger(android::base::LogId id, android::base::LogSeverity severity,
|
|||
const char* tag, const char* file, unsigned int line,
|
||||
const char* message) {
|
||||
android::base::StderrLogger(id, severity, tag, file, line, message);
|
||||
#if defined(_WIN32)
|
||||
// stderr can be buffered on Windows (and setvbuf doesn't seem to work), so explicitly flush.
|
||||
fflush(stderr);
|
||||
#endif
|
||||
|
||||
#if !ADB_HOST
|
||||
// Only print logs of INFO or higher to logcat, so that `adb logcat` with adbd tracing on
|
||||
// doesn't result in exponential logging.
|
||||
|
|
|
@ -332,13 +332,6 @@ static void process_device(libusb_device* device) {
|
|||
return;
|
||||
}
|
||||
|
||||
rc = libusb_set_interface_alt_setting(handle.get(), interface_num, 0);
|
||||
if (rc != 0) {
|
||||
LOG(WARNING) << "failed to set interface alt setting for device '" << device_serial
|
||||
<< "'" << libusb_error_name(rc);
|
||||
return;
|
||||
}
|
||||
|
||||
for (uint8_t endpoint : {bulk_in, bulk_out}) {
|
||||
rc = libusb_clear_halt(handle.get(), endpoint);
|
||||
if (rc != 0) {
|
||||
|
|
Loading…
Reference in a new issue