commit dc4193b0ad5f312cc67983fe5febbc3ccd6c56b7
author Josh Gao <jmgao@google.com> Wed Aug 02 23:25:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 23:25:26 2017 +0000
tree a0a9d49f13402570b6f6a4b109f6d1ed4b3ca1da
parent 735cea3eb70591a94ff408ac319685c362ebf2f6
parent d41e3585bd1ced56c40acce46baadb11ccafc039

Merge "base: work around thread safety analysis bug." am: f3c7f10abd
am: f727a3933e

Change-Id: Idec1b1d5e43745b6db43fa9f4ad0ad9c639b58e6

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