Browse Source

fix [Fatal Error] :3:214: The value of attribute "name" associated with an element type "item" must not contain the '<' character.

liuyuqi-dellpc 5 years ago
parent
commit
af6ed51380

+ 11 - 11
accounts/annotations.xml

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
 <root>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account&gt; renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account&gt; renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback&lt;android.accounts.Account&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.AUTHENTICATE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.AUTHENTICATE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account&gt; renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler) 1">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.accounts.Account&gt; renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback&lt;android.accounts.Account&gt;, android.os.Handler) 1">
     <annotation name="androidx.annotation.Size">
     <annotation name="androidx.annotation.Size">
       <val name="min" val="1" />
       <val name="min" val="1" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="value" val="&quot;android.permission.USE_CREDENTIALS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)">
+  <item name="android.accounts.AccountManager android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt; updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;, android.os.Handler)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="value" val="&quot;android.permission.MANAGE_ACCOUNTS&quot;" />
       <val name="apis" val="&quot;..22&quot;" />
       <val name="apis" val="&quot;..22&quot;" />

+ 2 - 2
bluetooth/le/annotations.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
 <root>
-  <item name="android.bluetooth.le.BluetoothLeScanner int startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.app.PendingIntent)">
+  <item name="android.bluetooth.le.BluetoothLeScanner int startScan(java.util.List&lt;android.bluetooth.le.ScanFilter&gt;, android.bluetooth.le.ScanSettings, android.app.PendingIntent)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
     </annotation>
     </annotation>
@@ -10,7 +10,7 @@
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.bluetooth.le.BluetoothLeScanner void startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback)">
+  <item name="android.bluetooth.le.BluetoothLeScanner void startScan(java.util.List&lt;android.bluetooth.le.ScanFilter&gt;, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
       <val name="value" val="&quot;android.permission.BLUETOOTH_ADMIN&quot;" />
     </annotation>
     </annotation>

+ 1 - 1
graphics/annotations.xml

@@ -731,7 +731,7 @@
   <item name="android.graphics.ImageDecoder android.graphics.ImageDecoder.Source createSource(java.nio.ByteBuffer)">
   <item name="android.graphics.ImageDecoder android.graphics.ImageDecoder.Source createSource(java.nio.ByteBuffer)">
     <annotation name="androidx.annotation.AnyThread"/>
     <annotation name="androidx.annotation.AnyThread"/>
   </item>
   </item>
-  <item name="android.graphics.ImageDecoder android.graphics.ImageDecoder.Source createSource(java.util.concurrent.Callable<android.content.res.AssetFileDescriptor>)">
+  <item name="android.graphics.ImageDecoder android.graphics.ImageDecoder.Source createSource(java.util.concurrent.Callable&lt;android.content.res.AssetFileDescriptor&gt;)">
     <annotation name="androidx.annotation.AnyThread"/>
     <annotation name="androidx.annotation.AnyThread"/>
   </item>
   </item>
   <item name="android.graphics.ImageDecoder android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source)">
   <item name="android.graphics.ImageDecoder android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source)">

+ 1 - 1
hardware/camera2/params/annotations.xml

@@ -65,7 +65,7 @@
       <val name="from" val="0" />
       <val name="from" val="0" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.hardware.camera2.params.SessionConfiguration SessionConfiguration(int, java.util.List<android.hardware.camera2.params.OutputConfiguration>, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.StateCallback) 0">
+  <item name="android.hardware.camera2.params.SessionConfiguration SessionConfiguration(int, java.util.List&lt;android.hardware.camera2.params.OutputConfiguration&gt;, java.util.concurrent.Executor, android.hardware.camera2.CameraCaptureSession.StateCallback) 0">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.hardware.camera2.params.SessionConfiguration.SESSION_REGULAR, android.hardware.camera2.params.SessionConfiguration.SESSION_HIGH_SPEED}" />
       <val name="value" val="{android.hardware.camera2.params.SessionConfiguration.SESSION_REGULAR, android.hardware.camera2.params.SessionConfiguration.SESSION_HIGH_SPEED}" />
     </annotation>
     </annotation>

+ 2 - 2
net/wifi/annotations.xml

@@ -10,7 +10,7 @@
       <val name="from" val="-1" />
       <val name="from" val="-1" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.net.wifi.WifiManager int addNetworkSuggestions(java.util.List<android.net.wifi.WifiNetworkSuggestion>)">
+  <item name="android.net.wifi.WifiManager int addNetworkSuggestions(java.util.List&lt;android.net.wifi.WifiNetworkSuggestion&gt;)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.CHANGE_WIFI_STATE&quot;" />
       <val name="value" val="&quot;android.permission.CHANGE_WIFI_STATE&quot;" />
     </annotation>
     </annotation>
@@ -18,7 +18,7 @@
       <val name="value" val="{android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID}" />
       <val name="value" val="{android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP, android.net.wifi.WifiManager.STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID}" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.net.wifi.WifiManager int removeNetworkSuggestions(java.util.List<android.net.wifi.WifiNetworkSuggestion>)">
+  <item name="android.net.wifi.WifiManager int removeNetworkSuggestions(java.util.List&lt;android.net.wifi.WifiNetworkSuggestion&gt;)">
     <annotation name="androidx.annotation.RequiresPermission">
     <annotation name="androidx.annotation.RequiresPermission">
       <val name="value" val="&quot;android.permission.CHANGE_WIFI_STATE&quot;" />
       <val name="value" val="&quot;android.permission.CHANGE_WIFI_STATE&quot;" />
     </annotation>
     </annotation>

+ 1 - 1
preference/annotations.xml

@@ -63,7 +63,7 @@
   <item name="android.preference.PreferenceActivity android.content.Intent onBuildStartFragmentIntent(java.lang.String, android.os.Bundle, int, int) 2">
   <item name="android.preference.PreferenceActivity android.content.Intent onBuildStartFragmentIntent(java.lang.String, android.os.Bundle, int, int) 2">
     <annotation name="androidx.annotation.StringRes"/>
     <annotation name="androidx.annotation.StringRes"/>
   </item>
   </item>
-  <item name="android.preference.PreferenceActivity void loadHeadersFromResource(int, java.util.List<android.preference.PreferenceActivity.Header>) 0">
+  <item name="android.preference.PreferenceActivity void loadHeadersFromResource(int, java.util.List&lt;android.preference.PreferenceActivity.Header&gt;) 0">
     <annotation name="androidx.annotation.XmlRes"/>
     <annotation name="androidx.annotation.XmlRes"/>
   </item>
   </item>
   <item name="android.preference.PreferenceActivity void startPreferencePanel(java.lang.String, android.os.Bundle, int, java.lang.CharSequence, android.app.Fragment, int) 2">
   <item name="android.preference.PreferenceActivity void startPreferencePanel(java.lang.String, android.os.Bundle, int, java.lang.CharSequence, android.app.Fragment, int) 2">

+ 1 - 1
telephony/annotations.xml

@@ -404,7 +404,7 @@
       <val name="value" val="&quot;android.permission.MODIFY_PHONE_STATE&quot;" />
       <val name="value" val="&quot;android.permission.MODIFY_PHONE_STATE&quot;" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.telephony.TelephonyManager void updateAvailableNetworks(java.util.List<android.telephony.AvailableNetworkInfo>, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>) 2">
+  <item name="android.telephony.TelephonyManager void updateAvailableNetworks(java.util.List&lt;android.telephony.AvailableNetworkInfo&gt;, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>) 2">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_SUCCESS, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_UNKNOWN_FAILURE, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_ABORTED, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_NO_CARRIER_PRIVILEGE}" />
       <val name="value" val="{android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_SUCCESS, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_UNKNOWN_FAILURE, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_ABORTED, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS, android.telephony.TelephonyManager.UPDATE_AVAILABLE_NETWORKS_NO_CARRIER_PRIVILEGE}" />
     </annotation>
     </annotation>

+ 4 - 4
view/annotations.xml

@@ -291,17 +291,17 @@
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.view.View void addFocusables(java.util.ArrayList<android.view.View>, int) 1">
+  <item name="android.view.View void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int) 1">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.view.View void addFocusables(java.util.ArrayList<android.view.View>, int, int) 1">
+  <item name="android.view.View void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int, int) 1">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
       <val name="value" val="{android.view.View.FOCUS_BACKWARD, android.view.View.FOCUS_FORWARD, android.view.View.FOCUS_LEFT, android.view.View.FOCUS_UP, android.view.View.FOCUS_RIGHT, android.view.View.FOCUS_DOWN}" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.view.View void addFocusables(java.util.ArrayList<android.view.View>, int, int) 2">
+  <item name="android.view.View void addFocusables(java.util.ArrayList&lt;android.view.View&gt;, int, int) 2">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="flag" val="true" />
       <val name="flag" val="true" />
       <val name="value" val="{android.view.View.FOCUSABLES_ALL, android.view.View.FOCUSABLES_TOUCH_MODE}" />
       <val name="value" val="{android.view.View.FOCUSABLES_ALL, android.view.View.FOCUSABLES_TOUCH_MODE}" />
@@ -343,7 +343,7 @@
   <item name="android.view.View void drawableStateChanged()">
   <item name="android.view.View void drawableStateChanged()">
     <annotation name="androidx.annotation.CallSuper"/>
     <annotation name="androidx.annotation.CallSuper"/>
   </item>
   </item>
-  <item name="android.view.View void findViewsWithText(java.util.ArrayList<android.view.View>, java.lang.CharSequence, int) 2">
+  <item name="android.view.View void findViewsWithText(java.util.ArrayList&lt;android.view.View&gt;, java.lang.CharSequence, int) 2">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="flag" val="true" />
       <val name="flag" val="true" />
       <val name="value" val="{android.view.View.FIND_VIEWS_WITH_TEXT, android.view.View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION}" />
       <val name="value" val="{android.view.View.FIND_VIEWS_WITH_TEXT, android.view.View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION}" />

+ 2 - 2
view/textclassifier/annotations.xml

@@ -235,12 +235,12 @@
       <val name="to" val="1.0" />
       <val name="to" val="1.0" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.view.textclassifier.TextLinks int apply(android.text.Spannable, int, java.util.function.Function<android.view.textclassifier.TextLinks.TextLink,android.view.textclassifier.TextLinks.TextLinkSpan>)">
+  <item name="android.view.textclassifier.TextLinks int apply(android.text.Spannable, int, java.util.function.Function&lt;android.view.textclassifier.TextLinks.TextLink,android.view.textclassifier.TextLinks.TextLinkSpan&gt;)">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.view.textclassifier.TextLinks.STATUS_LINKS_APPLIED, android.view.textclassifier.TextLinks.STATUS_NO_LINKS_FOUND, android.view.textclassifier.TextLinks.STATUS_NO_LINKS_APPLIED, android.view.textclassifier.TextLinks.STATUS_DIFFERENT_TEXT, android.view.textclassifier.TextLinks.STATUS_UNSUPPORTED_CHARACTER}" />
       <val name="value" val="{android.view.textclassifier.TextLinks.STATUS_LINKS_APPLIED, android.view.textclassifier.TextLinks.STATUS_NO_LINKS_FOUND, android.view.textclassifier.TextLinks.STATUS_NO_LINKS_APPLIED, android.view.textclassifier.TextLinks.STATUS_DIFFERENT_TEXT, android.view.textclassifier.TextLinks.STATUS_UNSUPPORTED_CHARACTER}" />
     </annotation>
     </annotation>
   </item>
   </item>
-  <item name="android.view.textclassifier.TextLinks int apply(android.text.Spannable, int, java.util.function.Function<android.view.textclassifier.TextLinks.TextLink,android.view.textclassifier.TextLinks.TextLinkSpan>) 1">
+  <item name="android.view.textclassifier.TextLinks int apply(android.text.Spannable, int, java.util.function.Function&lt;android.view.textclassifier.TextLinks.TextLink,android.view.textclassifier.TextLinks.TextLinkSpan&gt;) 1">
     <annotation name="androidx.annotation.IntDef">
     <annotation name="androidx.annotation.IntDef">
       <val name="value" val="{android.view.textclassifier.TextLinks.APPLY_STRATEGY_IGNORE, android.view.textclassifier.TextLinks.APPLY_STRATEGY_REPLACE}" />
       <val name="value" val="{android.view.textclassifier.TextLinks.APPLY_STRATEGY_IGNORE, android.view.textclassifier.TextLinks.APPLY_STRATEGY_REPLACE}" />
     </annotation>
     </annotation>