diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml')
| -rw-r--r-- | java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml index a5aef3c11bb8..08c07b4d957f 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml @@ -2,6 +2,9 @@ <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer boolean acquireQueued(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer boolean findNodeFromTail(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node) 0"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer boolean hasWaiters(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -35,6 +38,9 @@ <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.util.concurrent.locks.AbstractQueuedSynchronizer.Node enq(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer void cancelAcquire(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node) 0"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer void setHead(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -50,6 +56,9 @@ <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject boolean awaitUntil(java.util.Date) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject boolean isOwnedBy(java.util.concurrent.locks.AbstractQueuedSynchronizer) 0"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject java.util.concurrent.locks.AbstractQueuedSynchronizer.Node addConditionWaiter()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -59,6 +68,9 @@ <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject void doSignalAll(java.util.concurrent.locks.AbstractQueuedSynchronizer.Node) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.LockSupport void unpark(java.lang.Thread) 0"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.ReentrantLock boolean hasWaiters(java.util.concurrent.locks.Condition) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> |