summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
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 /api/system-current.txt
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 'api/system-current.txt')
-rw-r--r--api/system-current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 0b887d5..503ccba 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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";