summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao2017-08-02 18:10:42 -0500
committerGerrit Code Review2017-08-02 18:10:42 -0500
commitb5c90e9d6b3218d80055dddf7b27cd1fa2a5c024 (patch)
treedec079041a68011b569f1e32dcfbe565e459e45d
parentf3c7f10abddfce1bfcf2db1a48472a9ebfa3d097 (diff)
parentc54e3dba8dabba0544f9ab80a38574e15052c70c (diff)
downloadplatform-system-core-b5c90e9d6b3218d80055dddf7b27cd1fa2a5c024.tar.gz
platform-system-core-b5c90e9d6b3218d80055dddf7b27cd1fa2a5c024.tar.xz
platform-system-core-b5c90e9d6b3218d80055dddf7b27cd1fa2a5c024.zip
Merge "Revert "base: work around thread safety analysis bug.""
-rw-r--r--base/include/android-base/thread_annotations.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h
index 65eb015c3..fbb592336 100644
--- a/base/include/android-base/thread_annotations.h
+++ b/base/include/android-base/thread_annotations.h
@@ -71,12 +71,11 @@
71#define EXCLUDES(...) \ 71#define EXCLUDES(...) \
72 THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__)) 72 THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
73 73
74// b/64226736: assert_capability and assert_shared_capability are non-functional.
75#define ASSERT_CAPABILITY(x) \ 74#define ASSERT_CAPABILITY(x) \
76 THREAD_ANNOTATION_ATTRIBUTE__(assert_lock(x)) 75 THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))
77 76
78#define ASSERT_SHARED_CAPABILITY(x) \ 77#define ASSERT_SHARED_CAPABILITY(x) \
79 THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_lock(x)) 78 THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
80 79
81#define RETURN_CAPABILITY(x) \ 80#define RETURN_CAPABILITY(x) \
82 THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x)) 81 THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))