diff options
author | Carlos Valdivia <carlosvaldivia@google.com> | 2015-07-10 13:04:43 -0700 |
---|---|---|
committer | Carlos Valdivia <carlosvaldivia@google.com> | 2015-07-10 14:47:07 -0700 |
commit | a3db8acf3d05d66162834cca3129792aa571bcca (patch) | |
tree | b8bcb125b7adb16cd1ac141610113df3916b8289 /api | |
parent | 6795a2aeafa6df8a5e8e3045d29991d33c8db33f (diff) | |
download | frameworks_base-a3db8acf3d05d66162834cca3129792aa571bcca.zip frameworks_base-a3db8acf3d05d66162834cca3129792aa571bcca.tar.gz frameworks_base-a3db8acf3d05d66162834cca3129792aa571bcca.tar.bz2 |
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Fixes api stuff.
This reverts commit f2d248db8078e716b809e0a17cacdea5c5609bd5.
Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
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 b173638..71a47a9 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.ArrayList<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 14fff8a..dc691e8 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.ArrayList<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); |