Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated... (490d23bf) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -2733,7 +2733,6 @@ package android.accounts {
		}

		public class AccountManager {
		method public boolean accountAuthenticated(android.accounts.Account);
		method public android.accounts.AccountManagerFuture<android.os.Bundle> addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
		method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle);
		method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);
		@@ -2757,6 +2756,7 @@ package android.accounts {
		method public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
		method public void invalidateAuthToken(java.lang.String, java.lang.String);
		method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
		method public boolean notifyAccountAuthenticated(android.accounts.Account);
		method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String);
		method public deprecated android.accounts.AccountManagerFuture<java.lang.Boolean> removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
		method public android.accounts.AccountManagerFuture<android.os.Bundle> removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
		@@ -2794,7 +2794,7 @@ package android.accounts {
		field public static final java.lang.String KEY_ERROR_CODE = "errorCode";
		field public static final java.lang.String KEY_ERROR_MESSAGE = "errorMessage";
		field public static final java.lang.String KEY_INTENT = "intent";
		field public static final java.lang.String KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH = "lastAuthenticatedTimeMillisEpoch";
		field public static final java.lang.String KEY_LAST_AUTHENTICATED_TIME = "lastAuthenticatedTime";
		field public static final java.lang.String KEY_PASSWORD = "password";
		field public static final java.lang.String KEY_USERDATA = "userdata";
		field public static final java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -2811,7 +2811,6 @@ package android.accounts {
		}

		public class AccountManager {
		method public boolean accountAuthenticated(android.accounts.Account);
		method public android.accounts.AccountManagerFuture<android.os.Bundle> addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
		method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle);
		method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);
		@@ -2835,6 +2834,7 @@ package android.accounts {
		method public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
		method public void invalidateAuthToken(java.lang.String, java.lang.String);
		method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
		method public boolean notifyAccountAuthenticated(android.accounts.Account);
		method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String);
		method public deprecated android.accounts.AccountManagerFuture<java.lang.Boolean> removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
		method public android.accounts.AccountManagerFuture<android.os.Bundle> removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
		@@ -2872,7 +2872,7 @@ package android.accounts {
		field public static final java.lang.String KEY_ERROR_CODE = "errorCode";
		field public static final java.lang.String KEY_ERROR_MESSAGE = "errorMessage";
		field public static final java.lang.String KEY_INTENT = "intent";
		field public static final java.lang.String KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH = "lastAuthenticatedTimeMillisEpoch";
		field public static final java.lang.String KEY_LAST_AUTHENTICATED_TIME = "lastAuthenticatedTime";
		field public static final java.lang.String KEY_PASSWORD = "password";
		field public static final java.lang.String KEY_USERDATA = "userdata";
		field public static final java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";

core/java/android/accounts/AccountManager.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -207,8 +207,7 @@ public class AccountManager {
		* were authenticated successfully. Time is specified in milliseconds since
		* epoch.
		*/
		public static final String KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH =
		"lastAuthenticatedTimeMillisEpoch";
		public static final String KEY_LAST_AUTHENTICATED_TIME = "lastAuthenticatedTime";

		/**
		* Authenticators using 'customTokens' option will also get the UID of the
		@@ -671,8 +670,8 @@ public class AccountManager {
		}

		/**
		* Informs the system that the account has been authenticated recently. This
		* recency may be used by other applications to verify the account. This
		* Notifies the system that the account has just been authenticated. This
		* information may be used by other applications to verify the account. This
		* should be called only when the user has entered correct credentials for
		* the account.
		* <p>
		@@ -685,7 +684,7 @@ public class AccountManager {
		*
		* @param account The {@link Account} to be updated.
		*/
		public boolean accountAuthenticated(Account account) {
		public boolean notifyAccountAuthenticated(Account account) {
		if (account == null)
		throw new IllegalArgumentException("account is null");
		try {
		@@ -1587,7 +1586,7 @@ public class AccountManager {
		* password prompt.
		*
		* <p>Also the returning Bundle may contain {@link
		* #KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH} indicating the last time the
		* #KEY_LAST_AUTHENTICATED_TIME} indicating the last time the
		* credential was validated/created.
		*
		* If an error occurred,{@link AccountManagerFuture#getResult()} throws:

services/core/java/com/android/server/accounts/AccountManagerService.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -2771,26 +2771,10 @@ public class AccountManagerService
		mAccountName, mAccountType
		});
		}
		result.putLong(AccountManager.KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH,
		result.putLong(AccountManager.KEY_LAST_AUTHENTICATED_TIME,
		lastAuthenticatedTime);
		}
		}
		if (mAuthDetailsRequired) {
		long lastAuthenticatedTime = -1;
		if (isAccountPresentForCaller(mAccountName, mAccountType)) {
		lastAuthenticatedTime = DatabaseUtils.longForQuery(
		mAccounts.openHelper.getReadableDatabase(),
		"select " + ACCOUNTS_LAST_AUTHENTICATE_TIME_EPOCH_MILLIS + " from "
		+
		TABLE_ACCOUNTS + " WHERE " + ACCOUNTS_NAME + "=? AND "
		+ ACCOUNTS_TYPE + "=?",
		new String[] {
		mAccountName, mAccountType
		});
		}
		result.putLong(AccountManager.KEY_LAST_AUTHENTICATE_TIME_MILLIS_EPOCH,
		lastAuthenticatedTime);
		}
		}
		if (result != null
		&& (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {