diff options
| author | 2013-03-08 23:35:31 +0000 | |
|---|---|---|
| committer | 2013-03-08 23:35:31 +0000 | |
| commit | 515b51f83f1363329c66372be51813db15fb21c6 (patch) | |
| tree | 97b3453475e2a1e56a9cd778900b7a1e20bc0f78 | |
| parent | 28d4f210f17fa2ea46f155bc246953e23cf9addc (diff) | |
| parent | c8a1ff4036f9ca1e5d971ba231ea2d12aeff4019 (diff) | |
Merge "Make account cloning API public" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/accounts/AbstractAccountAuthenticator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 6fce7a414a60..57944538e3d1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2134,8 +2134,10 @@ package android.accounts { public abstract class AbstractAccountAuthenticator { ctor public AbstractAccountAuthenticator(android.content.Context); method public abstract android.os.Bundle addAccount(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException; + method public android.os.Bundle addAccountFromCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException; method public abstract android.os.Bundle confirmCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException; method public abstract android.os.Bundle editProperties(android.accounts.AccountAuthenticatorResponse, java.lang.String); + method public android.os.Bundle getAccountCredentialsForCloning(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException; method public android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException; method public abstract android.os.Bundle getAuthToken(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException; method public abstract java.lang.String getAuthTokenLabel(java.lang.String); diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java index fa4668968a16..dbc9051f11b4 100644 --- a/core/java/android/accounts/AbstractAccountAuthenticator.java +++ b/core/java/android/accounts/AbstractAccountAuthenticator.java @@ -505,7 +505,6 @@ public abstract class AbstractAccountAuthenticator { } /** - * @hide * Returns a Bundle that contains whatever is required to clone the account on a different * user. The Bundle is passed to the authenticator instance in the target user via * {@link #addAccountFromCredentials(AccountAuthenticatorResponse, Account, Bundle)}. @@ -529,7 +528,6 @@ public abstract class AbstractAccountAuthenticator { } /** - * @hide * Creates an account based on credentials provided by the authenticator instance of another * user on the device, who has chosen to share the account with this user. * @param response to send the result back to the AccountManager, will never be null |