commit 44ef1dea6b7391b8f7ad0926abc4714677232f6e
author Josh Gao <jmgao@google.com> Thu Aug 03 00:09:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 00:09:50 2017 +0000
tree beb576e29d157f611c0b7f93b4b60c49e5d43439
parent 7bd6d17a3c2d61e9ed118e6d95ebc9b43c481fc6
parent bd64a2abfa7c1c132e28e078ff2c0815c3b59415

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

Change-Id: Id5e5cee1294ae947bc2b9d1ce8d210c595b068cd

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))