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

Commit cb3f6e9f authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 

Merge commit '2aa2f78e' into kraken

* commit '2aa2f78e':
  allow null authtokens to invalidateAuthToken
parents d3bafad8 2aa2f78e

core/java/android/accounts/AccountManager.java

+5 −4
Original line number Diff line number Diff line
@@ -539,14 +539,15 @@ public class AccountManager { 
     * {@link android.Manifest.permission#MANAGE_ACCOUNTS} or

     * {@link android.Manifest.permission#USE_CREDENTIALS}

     *

     * @param accountType The account type of the auth token to invalidate

     * @param authToken The auth token to invalidate

     * @param accountType The account type of the auth token to invalidate, must not be null

     * @param authToken The auth token to invalidate, may be null

     */

    public void invalidateAuthToken(final String accountType, final String authToken) {

        if (accountType == null) throw new IllegalArgumentException("accountType is null");

        if (authToken == null) throw new IllegalArgumentException("authToken is null");

        try {

            if (authToken != null) {

                mService.invalidateAuthToken(accountType, authToken);

            }

        } catch (RemoteException e) {

            // won't ever happen

            throw new RuntimeException(e);