am fae288c7: Merge change I9efe265f into eclair

Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-plus-aosp

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse

2 files changed, 72 insertions, 3 deletions

diff --git a/api/current.xml b/api/current.xml
index 936e67e..b4161ae 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -14970,6 +14970,71 @@
 >
 </method>
 </interface>
+<class name="AccountManagerResponse"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<implements name="android.os.Parcelable">
+</implements>
+<method name="describeContents"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="onError"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="errorCode" type="int">
+</parameter>
+<parameter name="errorMessage" type="java.lang.String">
+</parameter>
+</method>
+<method name="onResult"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="result" type="android.os.Bundle">
+</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>
+</class>
 <class name="AccountsException"
  extends="java.lang.Exception"
  abstract="false"
diff --git a/core/java/android/accounts/AccountManagerResponse.java b/core/java/android/accounts/AccountManagerResponse.java
index 25371fd..1cd6a74 100644
--- a/core/java/android/accounts/AccountManagerResponse.java
+++ b/core/java/android/accounts/AccountManagerResponse.java
@@ -22,16 +22,17 @@ import android.os.Parcelable;
 import android.os.RemoteException;
 
 /**
- * Object that wraps calls to an {@link android.accounts.IAccountManagerResponse} object.
- * @hide
+ * Used by Account Authenticators to return a response.
  */
 public class AccountManagerResponse implements Parcelable {
     private IAccountManagerResponse mResponse;
 
+    /** @hide */
     public AccountManagerResponse(IAccountManagerResponse response) {
         mResponse = response;
     }
 
+    /** @hide */
     public AccountManagerResponse(Parcel parcel) {
         mResponse =
                 IAccountManagerResponse.Stub.asInterface(parcel.readStrongBinder());
@@ -53,14 +54,17 @@ public class AccountManagerResponse implements Parcelable {
         }
     }
 
+    /** @hide */
     public int describeContents() {
         return 0;
     }
 
+    /** @hide */
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeStrongBinder(mResponse.asBinder());
     }
 
+    /** @hide */
     public static final Creator<AccountManagerResponse> CREATOR =
             new Creator<AccountManagerResponse>() {
         public AccountManagerResponse createFromParcel(Parcel source) {
@@ -71,4 +75,4 @@ public class AccountManagerResponse implements Parcelable {
             return new AccountManagerResponse[size];
         }
     };
-}
\ No newline at end of file
+}