summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSimranjit Singh Kohli <simranjit@google.com>2015-04-29 23:13:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-29 23:13:34 +0000
commit490d23bf55360219652d5177baefcba9377e2f4d (patch)
treefbdde28798aa04fc5b90cc3bd499c07474812cf2 /core/java/android
parentdb2af23408a5b92011f9384bfb320ac8843f22b3 (diff)
parent1663b44cfd5fe589183dae5db769c843870cb5db (diff)
downloadframeworks_base-490d23bf55360219652d5177baefcba9377e2f4d.zip
frameworks_base-490d23bf55360219652d5177baefcba9377e2f4d.tar.gz
frameworks_base-490d23bf55360219652d5177baefcba9377e2f4d.tar.bz2
Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/accounts/AccountManager.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 480d171..ffa36d6 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -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: