Fix inconsistencies in Android annotations

android-sdk-annotations/android/util/annotations.xml

@@ -1,23 +1,38 @@
 <root>
-    <item name='android.util.SparseArray E valueAt(int)'>
+    <item name='android.util.AtomicFile byte[] readFully()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64InputStream Base64InputStream(java.io.InputStream, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.MonthDisplayHelper int[] getDigitsForRow(int)'>
+    <item name='android.util.IntProperty void setValue(T, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String)'>
+    <item name='android.util.Patterns java.lang.String digitsAndPlusOnly(java.util.regex.Matcher)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter endObject()'>
+    <item name='android.util.Spline java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Log java.lang.String getStackTraceString(java.lang.Throwable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(long)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.StringBuilderPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileInputStream openRead()'>
+    <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64OutputStream void write(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.StateSet int[] trimStateSet(int[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AttributeSet java.lang.String getAttributeName(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TimeUtils void formatDuration(long, java.io.PrintWriter, int) 1'>
@@ -26,12 +41,18 @@
     <item name='android.util.StateSet boolean stateSetMatches(int[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.Xml org.xmlpull.v1.XmlPullParser newPullParser()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.StateSet java.lang.String dump(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.DisplayMetrics boolean equals(android.util.DisplayMetrics) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -41,43 +62,64 @@
     <item name='android.util.IntProperty void set(T, java.lang.Integer) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.FastImmutableArraySet java.util.Iterator&lt;T&gt; iterator()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.FloatProperty void set(T, java.lang.Float) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Log int wtf(java.lang.String, java.lang.Throwable) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Log java.lang.String getStackTraceString(java.lang.Throwable)'>
+    <item name='android.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter endObject()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter void setIndent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LruCache V put(K, V) 1'>
+    <item name='android.util.TypedValue int complexToDimensionPixelOffset(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.TypedValue int complexToDimensionPixelOffset(int, android.util.DisplayMetrics) 1'>
+    <item name='android.util.DisplayMetrics java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.LruCache V put(K, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] decode(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(boolean)'>
+    <item name='android.util.Xml android.util.Xml.Encoding findEncodingByName(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LogPrinter void println(java.lang.String) 0'>
+    <item name='android.util.Property V get(T)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.FloatProperty void set(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml org.xmlpull.v1.XmlSerializer newSerializer()'>
+    <item name='android.util.LogPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[])'>
+    <item name='android.util.AtomicFile java.io.FileOutputStream startWrite()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AttributeSet java.lang.String getPositionDescription()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.TimeUtils java.lang.String formatUptime(long)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.LongSparseArray E valueAt(int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.AtomicFile java.io.File getBaseFile()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Property V get(T) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.AtomicFile AtomicFile(java.io.File) 0'>
@@ -92,10 +134,10 @@
     <item name='android.util.TimeUtils void formatDuration(long, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.StateSet int[] trimStateSet(int[], int)'>
+    <item name='android.util.SparseArray E valueAt(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LongSparseArray E valueAt(int)'>
+    <item name='android.util.LruCache java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue int complexToDimensionPixelSize(int, android.util.DisplayMetrics) 1'>
@@ -104,22 +146,19 @@
     <item name='android.util.TimeUtils void formatDuration(long, java.io.PrintWriter) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(long)'>
+    <item name='android.util.FloatProperty void setValue(T, float) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.IntProperty void set(java.lang.Object, java.lang.Object) 1'>
+    <item name='android.util.Property void set(T, V) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.File getBaseFile()'>
+    <item name='android.util.JsonReader java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.String)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter beginArray()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonReader java.lang.String toString()'>
+    <item name='android.util.IntProperty void set(java.lang.Object, java.lang.Object) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TimeUtils void formatDuration(long, long, java.io.PrintWriter) 2'>
@@ -128,58 +167,61 @@
     <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.StateSet java.lang.String dump(int[])'>
+    <item name='android.util.LogWriter void write(char[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] encode(byte[], int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.PrefixPrinter void println(java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.TypedValue float complexToDimensionNoisy(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Xml void parse(java.lang.String, org.xml.sax.ContentHandler) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String)'>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(boolean)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter nullValue()'>
+    <item name='android.util.Xml org.xmlpull.v1.XmlSerializer newSerializer()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml android.util.Xml.Encoding findEncodingByName(java.lang.String)'>
+    <item name='android.util.LruCache void entryRemoved(boolean, K, V, V) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileOutputStream openAppend()'>
+    <item name='android.util.JsonWriter android.util.JsonWriter beginArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter beginObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LruCache V remove(K) 0'>
+    <item name='android.util.TypedValue java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float complexToDimension(int, android.util.DisplayMetrics) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile java.io.FileOutputStream startWrite()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Log android.util.Log.TerribleFailureHandler setWtfHandler(android.util.Log.TerribleFailureHandler) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int) 0'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.PrintStreamPrinter void println(java.lang.String) 0'>
+    <item name='android.util.LruCache V remove(K) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonWriter android.util.JsonWriter endArray()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Patterns java.lang.String digitsAndPlusOnly(java.util.regex.Matcher)'>
+    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Log android.util.Log.TerribleFailureHandler setWtfHandler(android.util.Log.TerribleFailureHandler) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.StateSet java.lang.String dump(int[])'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.Number)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.PrintStreamPrinter void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.JsonReader JsonReader(java.io.Reader) 0'>
@@ -188,46 +230,52 @@
     <item name='android.util.StateSet boolean isWildCard(int[]) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml android.util.AttributeSet asAttributeSet(org.xmlpull.v1.XmlPullParser)'>
+    <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[])'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.DebugUtils void buildShortClassTag(java.lang.Object, java.lang.StringBuilder) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.FastImmutableArraySet java.util.Iterator&lt;T&gt; iterator()'>
+    <item name='android.util.AtomicFile java.io.FileOutputStream openAppend()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Xml android.util.AttributeSet asAttributeSet(org.xmlpull.v1.XmlPullParser)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64InputStream Base64InputStream(java.io.InputStream, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter beginObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.Base64InputStream int read(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Xml.Encoding android.util.Xml.Encoding valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter value(double)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.util.JsonWriter android.util.JsonWriter name(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.util.Base64OutputStream Base64OutputStream(java.io.OutputStream, int, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.JsonToken android.util.JsonToken valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(java.lang.Number)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.TypedValue java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.LruCache java.util.Map&lt;K,V&gt; snapshot()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Spline java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.Base64 java.lang.String encodeToString(byte[], int, int, int)'>
+    <item name='android.util.Pair android.util.Pair&lt;A,B&gt; create(A, B)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Spline android.util.Spline createMonotoneCubicSpline(float[], float[]) 1'>
@@ -236,37 +284,28 @@
     <item name='android.util.Xml void parse(java.io.InputStream, android.util.Xml.Encoding, org.xml.sax.ContentHandler) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.AtomicFile byte[] readFully()'>
+    <item name='android.util.MonthDisplayHelper int[] getDigitsForRow(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.LruCache V put(K, V) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Pair android.util.Pair&lt;A,B&gt; create(A, B)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.DisplayMetrics java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.util.Printer void println(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.Base64 byte[] decode(java.lang.String, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String)'>
+    <item name='android.util.AtomicFile java.io.FileInputStream openRead()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.DebugUtils boolean isObjectSelected(java.lang.Object) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.Xml org.xmlpull.v1.XmlPullParser newPullParser()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.util.JsonWriter JsonWriter(java.io.Writer) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.LruCache java.lang.String toString()'>
+    <item name='android.util.JsonWriter android.util.JsonWriter nullValue()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float getDimension(android.util.DisplayMetrics) 0'>
@@ -290,10 +329,7 @@
     <item name='android.util.Property android.util.Property&lt;T,V&gt; of(java.lang.Class&lt;T&gt;, java.lang.Class&lt;V&gt;, java.lang.String) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.util.TimeUtils java.lang.String formatUptime(long)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.util.JsonWriter android.util.JsonWriter value(double)'>
+    <item name='android.util.Patterns java.lang.String concatGroups(java.util.regex.Matcher)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.util.TypedValue float applyDimension(int, float, android.util.DisplayMetrics) 2'>