commit bd64a2abfa7c1c132e28e078ff2c0815c3b59415
author Josh Gao <jmgao@google.com> Wed Aug 02 23:59:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 23:59:32 2017 +0000
tree f964d163c7aa7fdbcd0fe4105c1f1acf273993c2
parent dc4193b0ad5f312cc67983fe5febbc3ccd6c56b7
parent 269f8c57df51f5050c203648f2d292a48f16332b

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

Change-Id: I37dc94c066c1527c10488e48c713c29b4e211cfb

base/include/android-base/thread_annotations.h

diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h
index 65eb015..fbb5923 100644
--- a/base/include/android-base/thread_annotations.h
+++ b/base/include/android-base/thread_annotations.h
@@ -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))