Fix inconsistencies in Android annotations

android-sdk-annotations/dalvik/system/annotations.xml

@@ -1,56 +1,65 @@
 <root>
-    <item name='dalvik.system.DexFile java.util.Enumeration&lt;java.lang.String&gt; entries()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.SocketTagger void tag(java.net.Socket) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard dalvik.system.CloseGuard get()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard void setReporter(dalvik.system.CloseGuard.Reporter) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.CloseGuard void open(java.lang.String) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BlockGuard void setThreadPolicy(dalvik.system.BlockGuard.Policy) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.BaseDexClassLoader java.lang.String getLdLibraryPath()'>
+    <item name='dalvik.system.BlockGuard.BlockGuardPolicyException java.lang.String getMessage()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.DexFile java.lang.String getName()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.BaseDexClassLoader java.util.Enumeration&lt;java.net.URL&gt; findResources(java.lang.String)'>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DalvikLogHandler void publish(java.util.logging.Logger, java.lang.String, java.util.logging.Level, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.SocketTagger void tag(java.net.Socket) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.VMRuntime dalvik.system.VMRuntime getRuntime()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard dalvik.system.CloseGuard get()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DalvikLogHandler void publish(java.util.logging.Logger, java.lang.String, java.util.logging.Level, java.lang.String) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard void setReporter(dalvik.system.CloseGuard.Reporter) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.CloseGuard void open(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.DalvikLogging java.lang.String loggerNameToTag(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BlockGuard void setThreadPolicy(dalvik.system.BlockGuard.Policy) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.util.Enumeration&lt;java.net.URL&gt; findResources(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.DexFile java.util.Enumeration&lt;java.lang.String&gt; entries()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.Zygote void appendQuotedShellArgs(java.lang.StringBuilder, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.VMDebug void dumpHprofData(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.Class&lt;?&gt; findClass(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.DexFile java.lang.Class loadClass(java.lang.String, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.BlockGuard.BlockGuardPolicyException java.lang.String getMessage()'>
+    <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.SocketTagger void set(dalvik.system.SocketTagger) 0'>
@@ -62,13 +71,16 @@
     <item name='dalvik.system.DexFile dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='dalvik.system.PathClassLoader PathClassLoader(java.lang.String, java.lang.ClassLoader) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.VMRuntime dalvik.system.VMRuntime getRuntime()'>
+    <item name='dalvik.system.DexClassLoader DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.lang.String getLdLibraryPath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.BaseDexClassLoader java.net.URL findResource(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.PathClassLoader PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader) 0'>
@@ -80,6 +92,9 @@
     <item name='dalvik.system.SocketTagger void untag(java.net.Socket) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.CloseGuard.Reporter void report(java.lang.String, java.lang.Throwable) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.DexFile DexFile(java.io.File) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

android-sdk-annotations/dalvik/system/profiler/annotations.xml

@@ -2,34 +2,37 @@
     <item name='dalvik.system.profiler.HprofData void addThreadEvent(dalvik.system.profiler.HprofData.ThreadEvent) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.StackTrace java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.HprofData java.util.Set&lt;dalvik.system.profiler.HprofData.Sample&gt; getSamples()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData java.util.Set&lt;dalvik.system.profiler.HprofData.Sample&gt; getSamples()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.HprofData java.util.List&lt;dalvik.system.profiler.HprofData.ThreadEvent&gt; getThreadHistory()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.SamplingProfiler.ThreadSet java.lang.Thread[] threads()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.HprofData getHprofData()'>
+    <item name='dalvik.system.profiler.BinaryHprof.ControlSettings dalvik.system.profiler.BinaryHprof.ControlSettings valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofBinaryToAscii void main(java.lang.String[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEventType dalvik.system.profiler.HprofData.ThreadEventType valueOf(java.lang.String)'>
+    <item name='dalvik.system.profiler.ThreadSampler java.lang.StackTraceElement[] getStackTrace(java.lang.Thread) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String) 0'>
@@ -38,49 +41,52 @@
     <item name='dalvik.system.profiler.BinaryHprofReader BinaryHprofReader(java.io.InputStream) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData java.util.List&lt;dalvik.system.profiler.HprofData.ThreadEvent&gt; getThreadHistory()'>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.AsciiHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent end(int)'>
+    <item name='dalvik.system.profiler.AsciiHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofData HprofData(java.util.Map&lt;dalvik.system.profiler.HprofData.StackTrace,int[]&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.StackTrace java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.HprofData void addStackTrace(dalvik.system.profiler.HprofData.StackTrace, int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.BinaryHprofReader dalvik.system.profiler.HprofData getHprofData()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent start(int, int, java.lang.String, java.lang.String, java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newArrayThreadSet(java.lang.Thread...)'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.BinaryHprofWriter void write(dalvik.system.profiler.HprofData, java.io.OutputStream) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.HprofData.Sample java.lang.String toString()'>
+    <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='dalvik.system.profiler.BinaryHprof.Tag dalvik.system.profiler.BinaryHprof.Tag valueOf(java.lang.String)'>
+    <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.HprofData getHprofData()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='dalvik.system.profiler.HprofData.StackTrace StackTrace(int, int, java.lang.StackTraceElement[]) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.Sample java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='dalvik.system.profiler.SamplingProfiler dalvik.system.profiler.SamplingProfiler.ThreadSet newThreadGroupThreadSet(java.lang.ThreadGroup) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='dalvik.system.profiler.HprofData.ThreadEvent dalvik.system.profiler.HprofData.ThreadEvent end(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='dalvik.system.profiler.BinaryHprofReader dalvik.system.profiler.HprofData getHprofData()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>