commit 7164efe291c7a5e3c48461dcddcafd543b0c7541
author Josh Gao <jmgao@google.com> Thu Aug 03 00:07:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 00:07:20 2017 +0000
tree b7c8b6cd55b707d45fe9fa86342e11bacfe045b8
parent 3822c316d59904761be3f830cb49b56f075f57ae
parent 7bd6d17a3c2d61e9ed118e6d95ebc9b43c481fc6

Merge "base: work around thread safety analysis bug." am: f3c7f10abd am: f727a3933e am: 14c7e22a50
am: 6db08e9e1f

Change-Id: I49dc1a551ee1da07a41896c62272225f70958ce8

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