Fix inconsistencies in Android annotations

android-sdk-annotations/android/net/wifi/p2p/annotations.xml

@@ -1,4 +1,7 @@
 <root>
+    <item name='android.net.wifi.p2p.WifiP2pConfig java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.IWifiP2pManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 2'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -11,15 +14,9 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroup java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getClientList()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup boolean removeClient(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub android.os.IBinder asBinder()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup WifiP2pGroup(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -32,16 +29,16 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroupList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pDeviceList boolean remove(android.net.wifi.p2p.WifiP2pDeviceList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void stopPeerDiscovery(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pGroup java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pService android.os.Messenger getMessenger()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.WifiP2pManager.PeerListListener void onPeersAvailable(android.net.wifi.p2p.WifiP2pDeviceList) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pConfig WifiP2pConfig(java.lang.String) 0'>
@@ -50,16 +47,13 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String getDeviceInfoHex()'>
+    <item name='android.net.wifi.p2p.WifiP2pWfdInfo void readFromParcel(android.os.Parcel) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pWfdInfo void readFromParcel(android.os.Parcel) 0'>
+    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice WifiP2pDevice(java.lang.String) 0'>
@@ -68,10 +62,10 @@
     <item name='android.net.wifi.p2p.WifiP2pConfig void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pManager void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener) 0'>
+    <item name='android.net.wifi.p2p.WifiP2pGroup java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService android.os.Messenger getMessenger()'>
+    <item name='android.net.wifi.p2p.WifiP2pManager void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
@@ -80,25 +74,31 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void deletePersistentGroup(android.net.wifi.p2p.WifiP2pManager.Channel, int, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void setDeviceName(android.net.wifi.p2p.WifiP2pManager.Channel, java.lang.String, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pGroup java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getClientList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getDeviceList()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDevice java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pGroupList java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.util.Collection&lt;android.net.wifi.p2p.WifiP2pDevice&gt; getDeviceList()'>
+    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(int)'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>
@@ -107,12 +107,18 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.IWifiP2pManager.Stub android.os.IBinder asBinder()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 1'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pDevice java.lang.String toString()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pDevice void update(android.net.wifi.p2p.WifiP2pDevice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -125,21 +131,21 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void startWps(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.WpsInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pInfo java.lang.String toString()'>
+    <item name='android.net.wifi.p2p.WifiP2pWfdInfo java.lang.String getDeviceInfoHex()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pDeviceList boolean remove(android.net.wifi.p2p.WifiP2pDevice) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pConfig java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
     <item name='android.net.wifi.p2p.WifiP2pWfdInfo void writeToParcel(android.os.Parcel, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -164,6 +170,9 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pService void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]) 2'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent WifiP2pProvDiscEvent(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
@@ -176,22 +185,22 @@
     <item name='android.net.wifi.p2p.WifiP2pManager void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pDeviceList java.lang.String toString()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='android.net.wifi.p2p.WifiP2pManager void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
+    <item name='android.net.wifi.p2p.WifiP2pInfo java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void requestPersistentGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='android.net.wifi.p2p.WifiP2pManager void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='android.net.wifi.p2p.WifiP2pGroup void addClient(java.lang.String) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
-    <item name='android.net.wifi.p2p.WifiP2pService.P2pStatus android.net.wifi.p2p.WifiP2pService.P2pStatus valueOf(int)'>
+    <item name='android.net.wifi.p2p.WifiP2pProvDiscEvent java.lang.String toString()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
     <item name='android.net.wifi.p2p.WifiP2pManager void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener) 1'>