am fe9d00bc: am bf13850b: am f7ae77cd: account manager api review changes

Merge commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886'

* commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886':
  account manager api review changes

1 files changed, 239 insertions, 640 deletions

diff --git a/api/current.xml b/api/current.xml
index 170d464..109ca3a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -122,11 +122,11 @@
  visibility="public"
 >
 </field>
-<field name="ACCOUNT_MANAGER_SERVICE"
+<field name="ACCOUNT_MANAGER"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;android.permission.ACCOUNT_MANAGER_SERVICE&quot;"
+ value="&quot;android.permission.ACCOUNT_MANAGER&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -13802,25 +13802,8 @@
 </parameter>
 <parameter name="account" type="android.accounts.Account">
 </parameter>
-</method>
-<method name="confirmPassword"
- return="boolean"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.AccountAuthenticatorResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
+<parameter name="options" type="android.os.Bundle">
 </parameter>
-<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
-</exception>
 </method>
 <method name="editProperties"
  return="android.os.Bundle"
@@ -13888,8 +13871,8 @@
 <parameter name="authTokenType" type="java.lang.String">
 </parameter>
 </method>
-<method name="getIAccountAuthenticator"
- return="android.accounts.IAccountAuthenticator"
+<method name="getIBinder"
+ return="android.os.IBinder"
  abstract="false"
  native="false"
  synchronized="false"
@@ -14074,16 +14057,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-</constructor>
-<constructor name="AccountAuthenticatorResponse"
- type="android.accounts.AccountAuthenticatorResponse"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
 <parameter name="parcel" type="android.os.Parcel">
 </parameter>
 </constructor>
@@ -14223,7 +14196,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="listener" type="android.accounts.OnAccountsUpdatedListener">
+<parameter name="listener" type="android.accounts.OnAccountsUpdateListener">
 </parameter>
 <parameter name="handler" type="android.os.Handler">
 </parameter>
@@ -14278,6 +14251,8 @@
 >
 <parameter name="account" type="android.accounts.Account">
 </parameter>
+<parameter name="options" type="android.os.Bundle">
+</parameter>
 <parameter name="activity" type="android.app.Activity">
 </parameter>
 <parameter name="callback" type="android.accounts.AccountManagerCallback&lt;android.os.Bundle&gt;">
@@ -14285,25 +14260,6 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
-<method name="confirmPassword"
- return="android.accounts.AccountManagerFuture&lt;java.lang.Boolean&gt;"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-<parameter name="callback" type="android.accounts.AccountManagerCallback&lt;java.lang.Boolean&gt;">
-</parameter>
-<parameter name="handler" type="android.os.Handler">
-</parameter>
-</method>
 <method name="editProperties"
  return="android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt;"
  abstract="false"
@@ -14424,7 +14380,7 @@
 </parameter>
 </method>
 <method name="getAuthTokenByFeatures"
- return="void"
+ return="android.accounts.AccountManagerFuture&lt;android.os.Bundle&gt;"
  abstract="false"
  native="false"
  synchronized="false"
@@ -14546,7 +14502,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="listener" type="android.accounts.OnAccountsUpdatedListener">
+<parameter name="listener" type="android.accounts.OnAccountsUpdateListener">
 </parameter>
 </method>
 <method name="setAuthToken"
@@ -14621,428 +14577,172 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
-</class>
-<interface name="AccountManagerCallback"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<method name="run"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
-</parameter>
-</method>
-</interface>
-<interface name="AccountManagerFuture"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="java.util.concurrent.Future">
-</implements>
-<method name="get"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="public"
->
-<exception name="ExecutionException" type="java.util.concurrent.ExecutionException">
-</exception>
-<exception name="InterruptedException" type="java.lang.InterruptedException">
-</exception>
-</method>
-<method name="get"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="public"
->
-<parameter name="timeout" type="long">
-</parameter>
-<parameter name="unit" type="java.util.concurrent.TimeUnit">
-</parameter>
-<exception name="ExecutionException" type="java.util.concurrent.ExecutionException">
-</exception>
-<exception name="InterruptedException" type="java.lang.InterruptedException">
-</exception>
-<exception name="TimeoutException" type="java.util.concurrent.TimeoutException">
-</exception>
-</method>
-<method name="getResult"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-<method name="getResult"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="timeout" type="long">
-</parameter>
-<parameter name="unit" type="java.util.concurrent.TimeUnit">
-</parameter>
-<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-</interface>
-<class name="AuthenticatorDescription"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.os.Parcelable">
-</implements>
-<constructor name="AuthenticatorDescription"
- type="android.accounts.AuthenticatorDescription"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="type" type="java.lang.String">
-</parameter>
-<parameter name="packageName" type="java.lang.String">
-</parameter>
-<parameter name="labelId" type="int">
-</parameter>
-<parameter name="iconId" type="int">
-</parameter>
-<parameter name="smallIconId" type="int">
-</parameter>
-<parameter name="prefId" type="int">
-</parameter>
-</constructor>
-<method name="describeContents"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="newKey"
- return="android.accounts.AuthenticatorDescription"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="type" type="java.lang.String">
-</parameter>
-</method>
-<method name="writeToParcel"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="dest" type="android.os.Parcel">
-</parameter>
-<parameter name="flags" type="int">
-</parameter>
-</method>
-<field name="CREATOR"
- type="android.os.Parcelable.Creator"
+<field name="ACTION_AUTHENTICATOR_INTENT"
+ type="java.lang.String"
  transient="false"
  volatile="false"
+ value="&quot;android.accounts.AccountAuthenticator&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="accountPreferencesId"
- type="int"
+<field name="AUTHENTICATOR_ATTRIBUTES_NAME"
+ type="java.lang.String"
  transient="false"
  volatile="false"
- static="false"
+ value="&quot;account-authenticator&quot;"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="iconId"
- type="int"
+<field name="AUTHENTICATOR_META_DATA_NAME"
+ type="java.lang.String"
  transient="false"
  volatile="false"
- static="false"
+ value="&quot;android.accounts.AccountAuthenticator&quot;"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="labelId"
+<field name="ERROR_CODE_BAD_ARGUMENTS"
  type="int"
  transient="false"
  volatile="false"
- static="false"
+ value="7"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="packageName"
- type="java.lang.String"
+<field name="ERROR_CODE_BAD_REQUEST"
+ type="int"
  transient="false"
  volatile="false"
- static="false"
+ value="8"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="smallIconId"
+<field name="ERROR_CODE_CANCELED"
  type="int"
  transient="false"
  volatile="false"
- static="false"
+ value="4"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="type"
- type="java.lang.String"
+<field name="ERROR_CODE_INVALID_RESPONSE"
+ type="int"
  transient="false"
  volatile="false"
- static="false"
+ value="5"
+ static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-</class>
-<class name="AuthenticatorException"
- extends="java.lang.Exception"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="AuthenticatorException"
- type="android.accounts.AuthenticatorException"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<constructor name="AuthenticatorException"
- type="android.accounts.AuthenticatorException"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="message" type="java.lang.String">
-</parameter>
-</constructor>
-<constructor name="AuthenticatorException"
- type="android.accounts.AuthenticatorException"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="cause" type="java.lang.Throwable">
-</parameter>
-</constructor>
-<constructor name="AuthenticatorException"
- type="android.accounts.AuthenticatorException"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="cause" type="java.lang.Throwable">
-</parameter>
-</constructor>
-</class>
-<class name="ChooseAccountActivity"
- extends="android.app.ListActivity"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="ChooseAccountActivity"
- type="android.accounts.ChooseAccountActivity"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="onCreate"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="savedInstanceState" type="android.os.Bundle">
-</parameter>
-</method>
-</class>
-<class name="Constants"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<field name="ACCOUNTS_KEY"
- type="java.lang.String"
+<field name="ERROR_CODE_NETWORK_ERROR"
+ type="int"
  transient="false"
  volatile="false"
- value="&quot;accounts&quot;"
+ value="3"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="ACCOUNT_AUTHENTICATOR_RESPONSE_KEY"
- type="java.lang.String"
+<field name="ERROR_CODE_REMOTE_EXCEPTION"
+ type="int"
  transient="false"
  volatile="false"
- value="&quot;accountAuthenticatorResponse&quot;"
+ value="1"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="ACCOUNT_MANAGER_RESPONSE_KEY"
- type="java.lang.String"
+<field name="ERROR_CODE_UNSUPPORTED_OPERATION"
+ type="int"
  transient="false"
  volatile="false"
- value="&quot;accountManagerResponse&quot;"
+ value="6"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="ACCOUNT_NAME_KEY"
+<field name="KEY_ACCOUNTS"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;authAccount&quot;"
+ value="&quot;accounts&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="ACCOUNT_TYPE_KEY"
+<field name="KEY_ACCOUNT_AUTHENTICATOR_RESPONSE"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;accountType&quot;"
+ value="&quot;accountAuthenticatorResponse&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="AUTHENTICATOR_ATTRIBUTES_NAME"
+<field name="KEY_ACCOUNT_MANAGER_RESPONSE"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;account-authenticator&quot;"
+ value="&quot;accountManagerResponse&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="AUTHENTICATOR_INTENT_ACTION"
+<field name="KEY_ACCOUNT_NAME"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;android.accounts.AccountAuthenticator&quot;"
+ value="&quot;authAccount&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="AUTHENTICATOR_META_DATA_NAME"
+<field name="KEY_ACCOUNT_TYPE"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;android.accounts.AccountAuthenticator&quot;"
+ value="&quot;accountType&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="AUTHENTICATOR_TYPES_KEY"
+<field name="KEY_AUTHENTICATOR_TYPES"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15053,7 +14753,7 @@
  visibility="public"
 >
 </field>
-<field name="AUTHTOKEN_KEY"
+<field name="KEY_AUTHTOKEN"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15064,7 +14764,7 @@
  visibility="public"
 >
 </field>
-<field name="AUTH_FAILED_MESSAGE_KEY"
+<field name="KEY_AUTH_FAILED_MESSAGE"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15075,7 +14775,7 @@
  visibility="public"
 >
 </field>
-<field name="AUTH_TOKEN_LABEL_KEY"
+<field name="KEY_AUTH_TOKEN_LABEL"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15086,7 +14786,7 @@
  visibility="public"
 >
 </field>
-<field name="BOOLEAN_RESULT_KEY"
+<field name="KEY_BOOLEAN_RESULT"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15097,51 +14797,7 @@
  visibility="public"
 >
 </field>
-<field name="ERROR_CODE_BAD_ARGUMENTS"
- type="int"
- transient="false"
- volatile="false"
- value="7"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_BAD_REQUEST"
- type="int"
- transient="false"
- volatile="false"
- value="8"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_CANCELED"
- type="int"
- transient="false"
- volatile="false"
- value="4"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_INVALID_RESPONSE"
- type="int"
- transient="false"
- volatile="false"
- value="5"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_KEY"
+<field name="KEY_ERROR_CODE"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15152,40 +14808,7 @@
  visibility="public"
 >
 </field>
-<field name="ERROR_CODE_NETWORK_ERROR"
- type="int"
- transient="false"
- volatile="false"
- value="3"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_REMOTE_EXCEPTION"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_CODE_UNSUPPORTED_OPERATION"
- type="int"
- transient="false"
- volatile="false"
- value="6"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="ERROR_MESSAGE_KEY"
+<field name="KEY_ERROR_MESSAGE"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15196,7 +14819,7 @@
  visibility="public"
 >
 </field>
-<field name="INTENT_KEY"
+<field name="KEY_INTENT"
  type="java.lang.String"
  transient="false"
  volatile="false"
@@ -15207,33 +14830,33 @@
  visibility="public"
 >
 </field>
-<field name="LOGIN_ACCOUNTS_CHANGED_ACTION"
+<field name="KEY_PASSWORD"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;android.accounts.LOGIN_ACCOUNTS_CHANGED&quot;"
+ value="&quot;password&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="PASSWORD_KEY"
+<field name="KEY_USERDATA"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;password&quot;"
+ value="&quot;userdata&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
 </field>
-<field name="USERDATA_KEY"
+<field name="LOGIN_ACCOUNTS_CHANGED_ACTION"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;userdata&quot;"
+ value="&quot;android.accounts.LOGIN_ACCOUNTS_CHANGED&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -15241,16 +14864,14 @@
 >
 </field>
 </class>
-<interface name="IAccountAuthenticator"
+<interface name="AccountManagerCallback"
  abstract="true"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<implements name="android.os.IInterface">
-</implements>
-<method name="addAccount"
+<method name="run"
  return="void"
  abstract="true"
  native="false"
@@ -15260,38 +14881,19 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="requiredFeatures" type="java.lang.String[]">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
+<parameter name="future" type="android.accounts.AccountManagerFuture&lt;V&gt;">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
 </method>
-<method name="confirmCredentials"
- return="void"
+</interface>
+<interface name="AccountManagerFuture"
  abstract="true"
- native="false"
- synchronized="false"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="confirmPassword"
- return="void"
+<method name="cancel"
+ return="boolean"
  abstract="true"
  native="false"
  synchronized="false"
@@ -15300,17 +14902,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
+<parameter name="mayInterruptIfRunning" type="boolean">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
 </method>
-<method name="editProperties"
- return="void"
+<method name="getResult"
+ return="V"
  abstract="true"
  native="false"
  synchronized="false"
@@ -15319,15 +14915,15 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
+<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
+</exception>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
 </exception>
 </method>
-<method name="getAccountRemovalAllowed"
- return="void"
+<method name="getResult"
+ return="V"
  abstract="true"
  native="false"
  synchronized="false"
@@ -15336,15 +14932,19 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
+<parameter name="timeout" type="long">
 </parameter>
-<parameter name="account" type="android.accounts.Account">
+<parameter name="unit" type="java.util.concurrent.TimeUnit">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
+<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
+</exception>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
 </exception>
 </method>
-<method name="getAuthToken"
- return="void"
+<method name="isCancelled"
+ return="boolean"
  abstract="true"
  native="false"
  synchronized="false"
@@ -15353,19 +14953,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
 </method>
-<method name="getAuthTokenLabel"
- return="void"
+<method name="isDone"
+ return="boolean"
  abstract="true"
  native="false"
  synchronized="false"
@@ -15374,74 +14964,89 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
 </method>
-<method name="hasFeatures"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
+</interface>
+<class name="AccountsException"
+ extends="java.lang.Exception"
+ abstract="false"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="features" type="java.lang.String[]">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="updateCredentials"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
+<constructor name="AccountsException"
+ type="android.accounts.AccountsException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<constructor name="AccountsException"
+ type="android.accounts.AccountsException"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
+<parameter name="message" type="java.lang.String">
 </parameter>
-<parameter name="account" type="android.accounts.Account">
+</constructor>
+<constructor name="AccountsException"
+ type="android.accounts.AccountsException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
 </parameter>
-<parameter name="authTokenType" type="java.lang.String">
+<parameter name="cause" type="java.lang.Throwable">
 </parameter>
-<parameter name="options" type="android.os.Bundle">
+</constructor>
+<constructor name="AccountsException"
+ type="android.accounts.AccountsException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</interface>
-<class name="IAccountAuthenticator.Stub"
- extends="android.os.Binder"
- abstract="true"
- static="true"
+</constructor>
+</class>
+<class name="AuthenticatorDescription"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<implements name="android.accounts.IAccountAuthenticator">
+<implements name="android.os.Parcelable">
 </implements>
-<constructor name="IAccountAuthenticator.Stub"
- type="android.accounts.IAccountAuthenticator.Stub"
+<constructor name="AuthenticatorDescription"
+ type="android.accounts.AuthenticatorDescription"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="packageName" type="java.lang.String">
+</parameter>
+<parameter name="labelId" type="int">
+</parameter>
+<parameter name="iconId" type="int">
+</parameter>
+<parameter name="smallIconId" type="int">
+</parameter>
+<parameter name="prefId" type="int">
+</parameter>
 </constructor>
-<method name="asBinder"
- return="android.os.IBinder"
+<method name="describeContents"
+ return="int"
  abstract="false"
  native="false"
  synchronized="false"
@@ -15451,8 +15056,8 @@
  visibility="public"
 >
 </method>
-<method name="asInterface"
- return="android.accounts.IAccountAuthenticator"
+<method name="newKey"
+ return="android.accounts.AuthenticatorDescription"
  abstract="false"
  native="false"
  synchronized="false"
@@ -15461,11 +15066,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="obj" type="android.os.IBinder">
+<parameter name="type" type="java.lang.String">
 </parameter>
 </method>
-<method name="onTransact"
- return="boolean"
+<method name="writeToParcel"
+ return="void"
  abstract="false"
  native="false"
  synchronized="false"
@@ -15474,139 +15079,133 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="code" type="int">
-</parameter>
-<parameter name="data" type="android.os.Parcel">
-</parameter>
-<parameter name="reply" type="android.os.Parcel">
+<parameter name="dest" type="android.os.Parcel">
 </parameter>
 <parameter name="flags" type="int">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
 </method>
-</class>
-<interface name="IAccountAuthenticatorResponse"
- abstract="true"
+<field name="CREATOR"
+ type="android.os.Parcelable.Creator"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="accountPreferencesId"
+ type="int"
+ transient="false"
+ volatile="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<implements name="android.os.IInterface">
-</implements>
-<method name="onError"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
+</field>
+<field name="iconId"
+ type="int"
+ transient="false"
+ volatile="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="errorCode" type="int">
-</parameter>
-<parameter name="errorMessage" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="onRequestContinued"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
+</field>
+<field name="labelId"
+ type="int"
+ transient="false"
+ volatile="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="onResult"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
+</field>
+<field name="packageName"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="value" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</interface>
-<class name="IAccountAuthenticatorResponse.Stub"
- extends="android.os.Binder"
- abstract="true"
- static="true"
- final="false"
+</field>
+<field name="smallIconId"
+ type="int"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<implements name="android.accounts.IAccountAuthenticatorResponse">
-</implements>
-<constructor name="IAccountAuthenticatorResponse.Stub"
- type="android.accounts.IAccountAuthenticatorResponse.Stub"
+</field>
+<field name="type"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
  static="false"
- final="false"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-</constructor>
-<method name="asBinder"
- return="android.os.IBinder"
+</field>
+</class>
+<class name="AuthenticatorException"
+ extends="android.accounts.AccountsException"
  abstract="false"
- native="false"
- synchronized="false"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-</method>
-<method name="asInterface"
- return="android.accounts.IAccountAuthenticatorResponse"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
+<constructor name="AuthenticatorException"
+ type="android.accounts.AuthenticatorException"
+ static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="obj" type="android.os.IBinder">
-</parameter>
-</method>
-<method name="onTransact"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
+</constructor>
+<constructor name="AuthenticatorException"
+ type="android.accounts.AuthenticatorException"
  static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="code" type="int">
+<parameter name="message" type="java.lang.String">
 </parameter>
-<parameter name="data" type="android.os.Parcel">
+</constructor>
+<constructor name="AuthenticatorException"
+ type="android.accounts.AuthenticatorException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
 </parameter>
-<parameter name="reply" type="android.os.Parcel">
+<parameter name="cause" type="java.lang.Throwable">
 </parameter>
-<parameter name="flags" type="int">
+</constructor>
+<constructor name="AuthenticatorException"
+ type="android.accounts.AuthenticatorException"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="cause" type="java.lang.Throwable">
 </parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
+</constructor>
 </class>
 <class name="NetworkErrorException"
- extends="java.lang.Exception"
+ extends="android.accounts.AccountsException"
  abstract="false"
  static="false"
  final="false"
@@ -15654,7 +15253,7 @@
 </parameter>
 </constructor>
 </class>
-<interface name="OnAccountsUpdatedListener"
+<interface name="OnAccountsUpdateListener"
  abstract="true"
  static="false"
  final="false"
@@ -15676,7 +15275,7 @@
 </method>
 </interface>
 <class name="OperationCanceledException"
- extends="java.lang.Exception"
+ extends="android.accounts.AccountsException"
  abstract="false"
  static="false"
  final="false"