Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e366f82c authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Update Account Discovery API. 

Use package name instead of uid.
Check calling package name in getAccounts methods.

Bug: 34841115, 34841115
Test: cts tests, manual tests.
Change-Id: I8a9e6aea5e2b6677be4bc414836b842239c5b6ac
parent 24e602a9

api/current.txt

+6 −6
Original line number Diff line number Diff line
@@ -2909,7 +2909,7 @@ package android.accounts { 
  public class AccountManager {

    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 boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.Integer, java.lang.Integer>);

    method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.String, java.lang.Integer>);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, java.lang.String[]);

    method public java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
@@ -2918,7 +2918,7 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public static android.accounts.AccountManager get(android.content.Context);

    method public int getAccountVisibility(android.accounts.Account, int);

    method public int getAccountVisibility(android.accounts.Account, java.lang.String);

    method public android.accounts.Account[] getAccounts();

    method public java.util.Map<android.accounts.Account, java.lang.Integer> getAccountsAndVisibilityForPackage(java.lang.String, java.lang.String);

    method public android.accounts.Account[] getAccountsByType(java.lang.String);
@@ -2929,9 +2929,9 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AuthenticatorDescription[] getAuthenticatorTypes();

    method public java.util.Map<java.lang.String, java.lang.Integer> getPackagesAndVisibilityForAccount(android.accounts.Account);

    method public java.lang.String getPassword(android.accounts.Account);

    method public java.lang.String getPreviousName(android.accounts.Account);

    method public java.util.Map<java.lang.Integer, java.lang.Integer> getUidsAndVisibilityForAccount(android.accounts.Account);

    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);
@@ -2945,7 +2945,7 @@ package android.accounts { 
    method public boolean removeAccountExplicitly(android.accounts.Account);

    method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener);

    method public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler);

    method public boolean setAccountVisibility(android.accounts.Account, int, int);

    method public boolean setAccountVisibility(android.accounts.Account, java.lang.String, int);

    method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);

    method public void setPassword(android.accounts.Account, java.lang.String);

    method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
@@ -2985,8 +2985,8 @@ package android.accounts { 
    field public static final java.lang.String KEY_PASSWORD = "password";

    field public static final java.lang.String KEY_USERDATA = "userdata";

    field public static final deprecated java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";

    field public static final int UID_KEY_DEFAULT_LEGACY_VISIBILITY = -3; // 0xfffffffd

    field public static final int UID_KEY_DEFAULT_VISIBILITY = -2; // 0xfffffffe

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE = "android.accounts.key_legacy_not_visible";

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_VISIBLE = "android.accounts.key_legacy_visible";

    field public static final int VISIBILITY_NOT_VISIBLE = 3; // 0x3

    field public static final int VISIBILITY_UNDEFINED = 0; // 0x0

    field public static final int VISIBILITY_USER_MANAGED_NOT_VISIBLE = 4; // 0x4

api/system-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -3028,7 +3028,7 @@ package android.accounts { 
  public class AccountManager {

    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 boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.Integer, java.lang.Integer>);

    method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.String, java.lang.Integer>);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, java.lang.String[]);

    method public java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
@@ -3038,7 +3038,7 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSessionAsUser(android.os.Bundle, android.app.Activity, android.os.UserHandle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public static android.accounts.AccountManager get(android.content.Context);

    method public int getAccountVisibility(android.accounts.Account, int);

    method public int getAccountVisibility(android.accounts.Account, java.lang.String);

    method public android.accounts.Account[] getAccounts();

    method public java.util.Map<android.accounts.Account, java.lang.Integer> getAccountsAndVisibilityForPackage(java.lang.String, java.lang.String);

    method public android.accounts.Account[] getAccountsByType(java.lang.String);
@@ -3049,9 +3049,9 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AuthenticatorDescription[] getAuthenticatorTypes();

    method public java.util.Map<java.lang.String, java.lang.Integer> getPackagesAndVisibilityForAccount(android.accounts.Account);

    method public java.lang.String getPassword(android.accounts.Account);

    method public java.lang.String getPreviousName(android.accounts.Account);

    method public java.util.Map<java.lang.Integer, java.lang.Integer> getUidsAndVisibilityForAccount(android.accounts.Account);

    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);
@@ -3065,7 +3065,7 @@ package android.accounts { 
    method public boolean removeAccountExplicitly(android.accounts.Account);

    method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener);

    method public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler);

    method public boolean setAccountVisibility(android.accounts.Account, int, int);

    method public boolean setAccountVisibility(android.accounts.Account, java.lang.String, int);

    method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);

    method public void setPassword(android.accounts.Account, java.lang.String);

    method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
@@ -3105,8 +3105,8 @@ package android.accounts { 
    field public static final java.lang.String KEY_PASSWORD = "password";

    field public static final java.lang.String KEY_USERDATA = "userdata";

    field public static final deprecated java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";

    field public static final int UID_KEY_DEFAULT_LEGACY_VISIBILITY = -3; // 0xfffffffd

    field public static final int UID_KEY_DEFAULT_VISIBILITY = -2; // 0xfffffffe

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE = "android.accounts.key_legacy_not_visible";

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_VISIBLE = "android.accounts.key_legacy_visible";

    field public static final int VISIBILITY_NOT_VISIBLE = 3; // 0x3

    field public static final int VISIBILITY_UNDEFINED = 0; // 0x0

    field public static final int VISIBILITY_USER_MANAGED_NOT_VISIBLE = 4; // 0x4

api/test-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -2909,7 +2909,7 @@ package android.accounts { 
  public class AccountManager {

    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 boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.Integer, java.lang.Integer>);

    method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle, java.util.Map<java.lang.String, java.lang.Integer>);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);

    method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, java.lang.String[]);

    method public java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
@@ -2918,7 +2918,7 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public static android.accounts.AccountManager get(android.content.Context);

    method public int getAccountVisibility(android.accounts.Account, int);

    method public int getAccountVisibility(android.accounts.Account, java.lang.String);

    method public android.accounts.Account[] getAccounts();

    method public java.util.Map<android.accounts.Account, java.lang.Integer> getAccountsAndVisibilityForPackage(java.lang.String, java.lang.String);

    method public android.accounts.Account[] getAccountsByType(java.lang.String);
@@ -2929,9 +2929,9 @@ package android.accounts { 
    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);

    method public android.accounts.AuthenticatorDescription[] getAuthenticatorTypes();

    method public java.util.Map<java.lang.String, java.lang.Integer> getPackagesAndVisibilityForAccount(android.accounts.Account);

    method public java.lang.String getPassword(android.accounts.Account);

    method public java.lang.String getPreviousName(android.accounts.Account);

    method public java.util.Map<java.lang.Integer, java.lang.Integer> getUidsAndVisibilityForAccount(android.accounts.Account);

    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);
@@ -2945,7 +2945,7 @@ package android.accounts { 
    method public boolean removeAccountExplicitly(android.accounts.Account);

    method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener);

    method public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler);

    method public boolean setAccountVisibility(android.accounts.Account, int, int);

    method public boolean setAccountVisibility(android.accounts.Account, java.lang.String, int);

    method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);

    method public void setPassword(android.accounts.Account, java.lang.String);

    method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
@@ -2985,8 +2985,8 @@ package android.accounts { 
    field public static final java.lang.String KEY_PASSWORD = "password";

    field public static final java.lang.String KEY_USERDATA = "userdata";

    field public static final deprecated java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";

    field public static final int UID_KEY_DEFAULT_LEGACY_VISIBILITY = -3; // 0xfffffffd

    field public static final int UID_KEY_DEFAULT_VISIBILITY = -2; // 0xfffffffe

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE = "android.accounts.key_legacy_not_visible";

    field public static final java.lang.String PACKAGE_NAME_KEY_LEGACY_VISIBLE = "android.accounts.key_legacy_visible";

    field public static final int VISIBILITY_NOT_VISIBLE = 3; // 0x3

    field public static final int VISIBILITY_UNDEFINED = 0; // 0x0

    field public static final int VISIBILITY_USER_MANAGED_NOT_VISIBLE = 4; // 0x4

core/java/android/accounts/AccountManager.java

+50 −36

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
        }

        if (oldVisibility != null

                && oldVisibility == AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE) {

            AccountManager.get(this).setAccountVisibility(account, mCallingUid,

            AccountManager.get(this).setAccountVisibility(account, mCallingPackage,

                    AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);

        }

        Bundle bundle = new Bundle();