diff options
| author | Carlos Valdivia <carlosvaldivia@google.com> | 2015-07-10 01:25:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 01:25:36 +0000 |
| commit | 319883c80e13ca980b2721a947805cde1999f204 (patch) | |
| tree | af281ba894c3d5b7bd0cc390c572516ba7aa3254 /api | |
| parent | 83e9525c614d4a959c5f243bcda9a75057930339 (diff) | |
| parent | c3b3f46d5fcbd89deeb557556e5a695c3e5349a1 (diff) | |
| download | frameworks_base-319883c80e13ca980b2721a947805cde1999f204.zip frameworks_base-319883c80e13ca980b2721a947805cde1999f204.tar.gz frameworks_base-319883c80e13ca980b2721a947805cde1999f204.tar.bz2 | |
Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index fe67aad..f5cf013 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2716,7 +2716,8 @@ package android.accounts { method public java.lang.String getUserData(android.accounts.Account, java.lang.String); 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 static deprecated android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle); + method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], 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); diff --git a/api/system-current.txt b/api/system-current.txt index 3570d42..24b437a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2813,7 +2813,8 @@ package android.accounts { method public java.lang.String getUserData(android.accounts.Account, java.lang.String); 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 static deprecated android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle); + method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], 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); |