Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e0b56ad authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: make darwin build with thread safety analysis." am: 971e6585 

am: b80ef5e6

Change-Id: I0c5e3ccdba1df55ae87ec32a7b88a0b499cebd09
parents 4bc080ab b80ef5e6

adb/client/usb_osx.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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();