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

Commit 5663833d authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "base: work around thread safety analysis bug." am: f3c7f10a am: f727a393 am: 14c7e22a 

am: 6db08e9e

Change-Id: I49dc1a551ee1da07a41896c62272225f70958ce8
parents 38b89517 6db08e9e

base/include/android-base/thread_annotations.h

+3 −2
Original line number Diff line number Diff line
@@ -71,11 +71,12 @@ 
#define EXCLUDES(...) \

      THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))



// b/64226736: assert_capability and assert_shared_capability are non-functional.

#define ASSERT_CAPABILITY(x) \

      THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))

      THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x))



#define ASSERT_SHARED_CAPABILITY(x) \

      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))

      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x))



#define RETURN_CAPABILITY(x) \

      THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))