From b924fbbf85687d824d18768be07151cc982fca7a Mon Sep 17 00:00:00 2001
From: Aleksandro Eterverda <aleksandro.eterverda@gmail.com>
Date: Wed, 25 Sep 2013 00:20:00 +0400
Subject: [PATCH 1/3] Fixed wrong annotations for android.os.Parcel

Parcel.readString() and Parcel.readStrongBinder() were wrongly annotated to return NotNull. In fact they both can return null and this is often used in Android development.
---
 android-sdk-annotations/android/os/annotations.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/android-sdk-annotations/android/os/annotations.xml b/android-sdk-annotations/android/os/annotations.xml
index 243c9871f5d..967291245c0 100644
--- a/android-sdk-annotations/android/os/annotations.xml
+++ b/android-sdk-annotations/android/os/annotations.xml
@@ -200,9 +200,6 @@
     <item name='android.os.AsyncTask android.os.AsyncTask.Status getStatus()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel android.os.IBinder readStrongBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.StrictMode.VmPolicy.Builder android.os.StrictMode.VmPolicy.Builder penaltyDeath()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -449,9 +446,6 @@
     <item name='android.os.StrictMode.ThreadPolicy.Builder android.os.StrictMode.ThreadPolicy.Builder detectNetwork()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.os.Parcel java.lang.String readString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.os.Bundle java.util.Set&lt;java.lang.String&gt; keySet()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

From 06b9f3d7b9182868206f4c665a74899219d2e7f7 Mon Sep 17 00:00:00 2001
From: Aleksandro Eterverda <aleksandro.eterverda@gmail.com>
Date: Wed, 25 Sep 2013 00:32:12 +0400
Subject: [PATCH 2/3] Fixed wrong annotations for android.content.ComponentName

ComponentName.getClassName() and ComponentName.getPackageName() cannot return null. Also it's not possible to create ComponentName with null packageName or className
---
 .../android/content/annotations.xml               | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/android-sdk-annotations/android/content/annotations.xml b/android-sdk-annotations/android/content/annotations.xml
index 05fb4a96d92..fadb969fb4d 100644
--- a/android-sdk-annotations/android/content/annotations.xml
+++ b/android-sdk-annotations/android/content/annotations.xml
@@ -758,6 +758,15 @@
     <item name='android.content.ComponentName ComponentName(android.content.Context, java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ComponentName ComponentName(android.content.Context, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ComponentName ComponentName(java.lang.String, java.lang.String) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ComponentName ComponentName(java.lang.String, java.lang.String) 1'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProviderOperation android.content.ContentProviderResult apply(android.content.ContentProvider, android.content.ContentProviderResult[], int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -1421,6 +1430,12 @@
     <item name='android.content.ComponentName java.lang.String flattenToString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.content.ComponentName java.lang.String getPackageName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.content.ComponentName java.lang.String getClassName()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.content.ContentProvider android.net.Uri insert(android.net.Uri, android.content.ContentValues) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>

From 30bf2c27f6f92a37a369f6bfdaeb60fa3f00d27a Mon Sep 17 00:00:00 2001
From: Aleksandro Eterverda <aleksandro.eterverda@gmail.com>
Date: Wed, 25 Sep 2013 01:11:33 +0400
Subject: [PATCH 3/3] Added more annotations for android.os.Message

Message.obtain() (all overloaded variants) never return null.
---
 .../android/os/annotations.xml                | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/android-sdk-annotations/android/os/annotations.xml b/android-sdk-annotations/android/os/annotations.xml
index 967291245c0..a58a95ddaef 100644
--- a/android-sdk-annotations/android/os/annotations.xml
+++ b/android-sdk-annotations/android/os/annotations.xml
@@ -71,9 +71,33 @@
     <item name='android.os.ParcelUuid void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.Message android.os.Message obtain()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Message)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.Message android.os.Message obtain(android.os.Message) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, java.lang.Runnable)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.os.Message android.os.Message obtain(android.os.Handler, int, int, int, java.lang.Object)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.os.Parcel java.util.ArrayList&lt;T&gt; createTypedArrayList(android.os.Parcelable.Creator&lt;T&gt;) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>