Merge "adb: make darwin build with thread safety analysis." am: 971e6585a6
am: b80ef5e6fd
am: 5e0b56adfa
am: fcfa8731c3
Change-Id: I1246b35a5bb2fc3c3f48995b3a00bc2de7e8b499
This commit is contained in:
commit
09e163e96b
1 changed files with 2 additions and 1 deletions
|
@ -38,6 +38,7 @@
|
|||
|
||||
#include <android-base/logging.h>
|
||||
#include <android-base/stringprintf.h>
|
||||
#include <android-base/thread_annotations.h>
|
||||
|
||||
#include "adb.h"
|
||||
#include "transport.h"
|
||||
|
@ -429,7 +430,7 @@ static void RunLoopThread() {
|
|||
VLOG(USB) << "RunLoopThread done";
|
||||
}
|
||||
|
||||
static void usb_cleanup() {
|
||||
static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
|
||||
VLOG(USB) << "usb_cleanup";
|
||||
// Wait until usb operations in RunLoopThread finish, and prevent further operations.
|
||||
operate_device_lock.lock();
|
||||
|
|
Loading…
Reference in a new issue