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

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

Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d... 

Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d am: 95605244 am: 9e4fb9a1
am: fb3d04b4

Change-Id: I8256d260aca83a4df7c20e03ff62f062fdc4d3a1
parents 5663833d fb3d04b4

base/include/android-base/thread_annotations.h

+2 −3
Original line number Diff line number Diff line
@@ -71,12 +71,11 @@ 
#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_lock(x))

      THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))



#define ASSERT_SHARED_CAPABILITY(x) \

      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x))

      THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))



#define RETURN_CAPABILITY(x) \

      THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))