Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 515b51f8 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Make account cloning API public" into jb-mr2-dev

parents 28d4f210 c8a1ff40

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/accounts/AbstractAccountAuthenticator.java

+0 −2
Original line number Diff line number Diff line
@@ -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