It is safe to call this method from the main thread. + *
+ * It is safe to call this method from the main thread. * - *
This method requires the caller to have a signature match with the - * authenticator that owns the specified account. + *
+ * This method requires the caller to have a signature match with the authenticator that owns + * the specified account. * - *
NOTE: If targeting your app to work on API level 22 and before, - * AUTHENTICATE_ACCOUNTS permission is needed for those platforms. See docs for - * this function in API level 22. + *
+ * NOTE: If targeting your app to work on API level + * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} and before, AUTHENTICATE_ACCOUNTS + * permission is needed for those platforms. See docs for this function in API level + * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}. * * @param account The account to query for a password. Must not be {@code null}. * @return The account's password, null if none or if the account doesn't exist @@ -372,19 +469,22 @@ public class AccountManager { } /** - * Gets the user data named by "key" associated with the account. - * This is intended for authenticators and related code to store - * arbitrary metadata along with accounts. The meaning of the keys - * and values is up to the authenticator for the account. + * Gets the user data named by "key" associated with the account. This is intended for + * authenticators and related code to store arbitrary metadata along with accounts. The meaning + * of the keys and values is up to the authenticator for the account. * - *
It is safe to call this method from the main thread. + *
+ * It is safe to call this method from the main thread. * - *
This method requires the caller to have a signature match with the - * authenticator that owns the specified account. + *
+ * This method requires the caller to have a signature match with the authenticator that owns + * the specified account. * - *
NOTE: If targeting your app to work on API level 22 and before, - * AUTHENTICATE_ACCOUNTS permission is needed for those platforms. See docs - * for this function in API level 22. + *
+ * NOTE: If targeting your app to work on API level + * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} and before, AUTHENTICATE_ACCOUNTS + * permission is needed for those platforms. See docs for this function in API level + * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}. * * @param account The account to query for user data * @return The user data, null if the account or key doesn't exist @@ -440,21 +540,18 @@ public class AccountManager { } /** - * Lists all accounts of any type registered on the device. - * Equivalent to getAccountsByType(null). + * Lists all accounts visible to the caller regardless of type. Equivalent to + * getAccountsByType(null). These accounts may be visible because the user granted access to the + * account, or the AbstractAcccountAuthenticator managing the account did so or because the + * client shares a signature with the managing AbstractAccountAuthenticator. * - *
It is safe to call this method from the main thread. + *
+ * It is safe to call this method from the main thread. * - *
Clients of this method that have not been granted the - * {@link android.Manifest.permission#GET_ACCOUNTS} permission, - * will only see those accounts managed by AbstractAccountAuthenticators whose - * signature matches the client. - * - * @return An array of {@link Account}, one for each account. Empty - * (never null) if no accounts have been added. + * @return An array of {@link Account}, one for each account. Empty (never null) if no accounts + * have been added. */ @NonNull - @RequiresPermission(GET_ACCOUNTS) public Account[] getAccounts() { try { return mService.getAccounts(null, mContext.getOpPackageName()); @@ -465,21 +562,16 @@ public class AccountManager { /** * @hide - * Lists all accounts of any type registered on the device for a given - * user id. Equivalent to getAccountsByType(null). + * Lists all accounts visible to caller regardless of type for a given user id. Equivalent to + * getAccountsByType(null). * - *
It is safe to call this method from the main thread. + *
+ * It is safe to call this method from the main thread. * - *
Clients of this method that have not been granted the - * {@link android.Manifest.permission#GET_ACCOUNTS} permission, - * will only see those accounts managed by AbstractAccountAuthenticators whose - * signature matches the client. - * - * @return An array of {@link Account}, one for each account. Empty - * (never null) if no accounts have been added. + * @return An array of {@link Account}, one for each account. Empty (never null) if no accounts + * have been added. */ @NonNull - @RequiresPermission(GET_ACCOUNTS) public Account[] getAccountsAsUser(int userId) { try { return mService.getAccountsAsUser(null, userId, mContext.getOpPackageName()); @@ -524,29 +616,41 @@ public class AccountManager { } /** - * Lists all accounts of a particular type. The account type is a - * string token corresponding to the authenticator and useful domain - * of the account. For example, there are types corresponding to Google - * and Facebook. The exact string token to use will be published somewhere - * associated with the authenticator in question. + * Lists all accounts of particular type visible to the caller. These accounts may be visible + * because the user granted access to the account, or the AbstractAcccountAuthenticator managing + * the account did so or because the client shares a signature with the managing + * AbstractAccountAuthenticator. * - *
It is safe to call this method from the main thread. + *
+ * The account type is a string token corresponding to the authenticator and useful domain of + * the account. For example, there are types corresponding to Google and Facebook. The exact + * string token to use will be published somewhere associated with the authenticator in + * question. * - *
Clients of this method that have not been granted the - * {@link android.Manifest.permission#GET_ACCOUNTS} permission, - * will only see those accounts managed by AbstractAccountAuthenticators whose - * signature matches the client. + *
+ * It is safe to call this method from the main thread. * - *
NOTE: If targeting your app to work on API level 22 and before, - * GET_ACCOUNTS permission is needed for those platforms, irrespective of uid - * or signature match. See docs for this function in API level 22. + *
+ * Caller targeting API level {@link android.os.Build.VERSION_CODES#O} and above, will get list + * of accounts made visible to it by user or AbstractAcccountAuthenticator and + * {@link android.Manifest.permission#GET_ACCOUNTS} permission is not used. + * + *
+ * Caller targeting API level below {@link android.os.Build.VERSION_CODES#O} that have not been + * granted the {@link android.Manifest.permission#GET_ACCOUNTS} permission, will only see those + * accounts managed by AbstractAccountAuthenticators whose signature matches the client. + * + *
+ * NOTE: If targeting your app to work on API level + * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} and before, GET_ACCOUNTS permission is + * needed for those platforms, irrespective of uid or signature match. See docs for this + * function in API level {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}. * * @param type The type of accounts to return, null to retrieve all accounts - * @return An array of {@link Account}, one per matching account. Empty - * (never null) if no accounts of the specified type have been added. + * @return An array of {@link Account}, one per matching account. Empty (never null) if no + * accounts of the specified type have been added. */ @NonNull - @RequiresPermission(GET_ACCOUNTS) public Account[] getAccountsByType(String type) { return getAccountsByTypeAsUser(type, Process.myUserHandle()); } @@ -612,30 +716,28 @@ public class AccountManager { } /** - * Finds out whether a particular account has all the specified features. - * Account features are authenticator-specific string tokens identifying - * boolean account properties. For example, features are used to tell - * whether Google accounts have a particular service (such as Google - * Calendar or Google Talk) enabled. The feature names and their meanings - * are published somewhere associated with the authenticator in question. + * Finds out whether a particular account has all the specified features. Account features are + * authenticator-specific string tokens identifying boolean account properties. For example, + * features are used to tell whether Google accounts have a particular service (such as Google + * Calendar or Google Talk) enabled. The feature names and their meanings are published + * somewhere associated with the authenticator in question. * - *
This method may be called from any thread, but the returned - * {@link AccountManagerFuture} must not be used on the main thread. + *
+ * This method may be called from any thread, but the returned {@link AccountManagerFuture} must + * not be used on the main thread. * - *
This method requires the caller to hold the permission - * {@link android.Manifest.permission#GET_ACCOUNTS} or be a signature - * match with the AbstractAccountAuthenticator that manages the account. + *
+ * If caller target API level is below {@link android.os.Build.VERSION_CODES#O}, it is
+ * required to hold the permission {@link android.Manifest.permission#GET_ACCOUNTS} or have a
+ * signature match with the AbstractAccountAuthenticator that manages the account.
*
* @param account The {@link Account} to test
* @param features An array of the account features to check
- * @param callback Callback to invoke when the request completes,
- * null for no callback
- * @param handler {@link Handler} identifying the callback thread,
- * null for the main thread
- * @return An {@link AccountManagerFuture} which resolves to a Boolean,
- * true if the account exists and has all of the specified features.
+ * @param callback Callback to invoke when the request completes, null for no callback
+ * @param handler {@link Handler} identifying the callback thread, null for the main thread
+ * @return An {@link AccountManagerFuture} which resolves to a Boolean, true if the account
+ * exists and has all of the specified features.
*/
- @RequiresPermission(GET_ACCOUNTS)
public AccountManagerFuture Unlike {@link #getAccountsByType}, this method calls the authenticator,
- * which may contact the server or do other work to check account features,
- * so the method returns an {@link AccountManagerFuture}.
+ *
+ * Unlike {@link #getAccountsByType}, this method calls the authenticator, which may contact the
+ * server or do other work to check account features, so the method returns an
+ * {@link AccountManagerFuture}.
*
- * This method may be called from any thread, but the returned
- * {@link AccountManagerFuture} must not be used on the main thread.
+ *
+ * This method may be called from any thread, but the returned {@link AccountManagerFuture} must
+ * not be used on the main thread.
+ *
+ *
+ * Caller targeting API level {@link android.os.Build.VERSION_CODES#O} and above, will get list
+ * of accounts made visible to it by user or AbstractAcccountAuthenticator and
+ * {@link android.Manifest.permission#GET_ACCOUNTS} permission is not used.
+ *
+ *
+ * Caller targeting API level below {@link android.os.Build.VERSION_CODES#O} that have not been
+ * granted the {@link android.Manifest.permission#GET_ACCOUNTS} permission, will only see those
+ * accounts managed by AbstractAccountAuthenticators whose signature matches the client.
+ *
+ * NOTE: If targeting your app to work on API level
+ * {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} and before, GET_ACCOUNTS permission is
+ * needed for those platforms, irrespective of uid or signature match. See docs for this
+ * function in API level {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}.
*
- * Clients of this method that have not been granted the
- * {@link android.Manifest.permission#GET_ACCOUNTS} permission,
- * will only see those accounts managed by AbstractAccountAuthenticators whose
- * signature matches the client.
*
* @param type The type of accounts to return, must not be null
- * @param features An array of the account features to require,
- * may be null or empty
- *
- * NOTE: If targeting your app to work on API level 22 and before,
- * GET_ACCOUNTS permission is needed for those platforms, irrespective of uid
- * or signature match. See docs for this function in API level 22.
- *
- * @param callback Callback to invoke when the request completes,
- * null for no callback
- * @param handler {@link Handler} identifying the callback thread,
- * null for the main thread
- * @return An {@link AccountManagerFuture} which resolves to an array of
- * {@link Account}, one per account of the specified type which
- * matches the requested features.
+ * @param features An array of the account features to require, may be null or empty *
+ * @param callback Callback to invoke when the request completes, null for no callback
+ * @param handler {@link Handler} identifying the callback thread, null for the main thread
+ * @return An {@link AccountManagerFuture} which resolves to an array of {@link Account}, one
+ * per account of the specified type which matches the requested features.
*/
- @RequiresPermission(GET_ACCOUNTS)
public AccountManagerFuture Normally used by sign-up wizards associated with authenticators, not
- * directly by applications.
- * Calling this method does not update the last authenticated timestamp,
- * referred by {@link #KEY_LAST_AUTHENTICATED_TIME}. To update it, call
+ * Adds an account directly to the AccountManager. Additionally this makes the Account visible
+ * to desired UIDs of applications on the device, and sends directed broadcasts to these
+ * individual applications.
+ *
+ * Normally used by sign-up wizards associated with authenticators, not directly by
+ * applications.
+ *
+ * Calling this method does not update the last authenticated timestamp, referred by
+ * {@link #KEY_LAST_AUTHENTICATED_TIME}. To update it, call
* {@link #notifyAccountAuthenticated(Account)} after getting success.
- * It is safe to call this method from the main thread.
- * This method requires the caller to have a signature match with the
- * authenticator that owns the specified account.
+ *
+ * It is safe to call this method from the main thread.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
*
* @param account The {@link Account} to add
* @param password The password to associate with the account, null for none
- * @param extras String values to use for the account's userdata, null for
- * none
- * @param selectedUids Array of uids whose associated applications can access
- * this account without any additional user approval.
+ * @param extras String values to use for the account's userdata, null for none
+ * @param selectedUids Array of uids whose associated applications can access this account
+ * without any additional user approval.
*
- * @return True if the account was successfully added, false if the account
- * already exists, the account is null, or another error occurs.
+ * @return True if the account was successfully added, false if the account already exists, the
+ * account is null, or another error occurs.
*/
public boolean addAccountExplicitly(Account account, String password, Bundle extras,
- int[] selectedUids) {
- if (account == null) throw new IllegalArgumentException("account is null");
+ int[] selectedUids) {
+ return false; // TODO remove this method.
+ }
+
+ /**
+ * Adds an account directly to the AccountManager. Additionally this makes the Account visible
+ * to desired UIDs of applications on the device, and sends directed broadcasts to these
+ * individual applications.
+ *
+ * Normally used by sign-up wizards associated with authenticators, not directly by
+ * applications.
+ *
+ * Calling this method does not update the last authenticated timestamp, referred by
+ * {@link #KEY_LAST_AUTHENTICATED_TIME}. To update it, call
+ * {@link #notifyAccountAuthenticated(Account)} after getting success.
+ *
+ * It is safe to call this method from the main thread.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
+ *
+ * @param account The {@link Account} to add
+ * @param password The password to associate with the account, null for none
+ * @param extras String values to use for the account's userdata, null for none
+ * @param visibility Map from uid to visibility values which will be set before account is
+ * added. See getAccountVisibility for possilbe values.
+ *
+ * @return True if the account was successfully added, false if the account already exists, the
+ * account is null, or another error occurs.
+ * @hide
+ */
+ public boolean addAccountExplicitly(Account account, String password, Bundle extras,
+ Map
+ *
+ * @param packageName Package name.
+ * @param accountType Account type.
+ *
+ * @return Map with visibility for all accounts of given type. See {@link #getAccountVisibility}
+ * for possilbe values.
+ * @hide
+ */
+ public Map This method requires the caller to have a signature match with the authenticator
- * that owns the specified account.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
*
* @param account Account to make visible.
* @param uid The UID of the application to add account access.
@@ -814,18 +983,18 @@ public class AccountManager {
*/
public boolean makeAccountVisible(Account account, int uid) {
try {
- return mService.makeAccountVisible(account, uid);
+ return mService.setAccountVisibility(account, uid, VISIBILITY_USER_MANAGED_VISIBLE);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
- * Removes visibility of certain account of a process identified
- * by a given UID to an application.
- * This is called by the Authenticator.
- * This method requires the caller to have a signature match with the authenticator
- * that owns the specified account.
+ * Removes visibility of certain account of a process identified by a given UID to an
+ * application. This is called by the Authenticator.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
*
* @param account Remove visibility of this account..
* @param uid The UID of the application to remove account access.
@@ -834,17 +1003,18 @@ public class AccountManager {
*/
public boolean removeAccountVisibility(Account account, int uid) {
try {
- return mService.removeAccountVisibility(account, uid);
+ return mService.setAccountVisibility(account, uid, VISIBILITY_USER_MANAGED_NOT_VISIBLE);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
- * Checks visibility of certain account of a process identified
- * by a given UID. This is called by the Authenticator.
- * This method requires the caller to have a signature match with the authenticator
- * that owns the specified account.
+ * Checks visibility of certain account of a process identified by a given UID. This is called
+ * by the Authenticator.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
*
* @param account Account to check visibility.
* @param uid The UID of the application to check account access.
@@ -853,7 +1023,60 @@ public class AccountManager {
*/
public boolean isAccountVisible(Account account, int uid) {
try {
- return mService.isAccountVisible(account, uid);
+ Integer visibility = mService.getAccountVisibility(account, uid);
+ return visibility == VISIBILITY_USER_MANAGED_NOT_VISIBLE
+ || visibility == VISIBILITY_VISIBLE;
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Set visibility value of given account to certain UID.
+ *
+ * See {@link #getAccountVisibility} for possible values.
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
+ *
+ * @param account Account to make visible.
+ * @param uid The UID of the application to modify account visibility.
+ * @param visibility - new visibility value.
+ *
+ * @return True if visibility value was succesfully updated.
+ * @hide
+ */
+ public boolean setAccountVisibility(Account account, int uid,
+ @AccountVisibility int visibility) {
+ try {
+ return mService.setAccountVisibility(account, uid, visibility);
+ } catch (RemoteException re) {
+ throw re.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Gets visibility of certain account for given UID. Possible returned values are:
+ *
+ * This method requires the caller to have a signature match with the authenticator that owns
+ * the specified account.
+ *
+ * @param account Account to get visibility.
+ * @param uid The UID of the application to get account visibility.
+ *
+ * @return int Visibility for given account and uid.
+ * @hide
+ */
+ public @AccountVisibility int getAccountVisibility(Account account, int uid) {
+ try {
+ return mService.getAccountVisibility(account, uid);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
@@ -2428,6 +2651,9 @@ public class AccountManager {
};
// have many accounts, launch the chooser
Intent intent = new Intent();
+ // TODO - this activity will not include
+ // USER_MANAGED_NOT_VISIBLE
+ // accounts. We need to move method to service
ComponentName componentName = ComponentName.unflattenFromString(
Resources.getSystem().getString(
R.string.config_chooseAccountActivity));
@@ -2483,58 +2709,57 @@ public class AccountManager {
}
/**
- * This convenience helper combines the functionality of
- * {@link #getAccountsByTypeAndFeatures}, {@link #getAuthToken}, and
- * {@link #addAccount}.
+ * This convenience helper combines the functionality of {@link #getAccountsByTypeAndFeatures},
+ * {@link #getAuthToken}, and {@link #addAccount}.
*
- * This method gets a list of the accounts matching the
- * specified type and feature set; if there is exactly one, it is
- * used; if there are more than one, the user is prompted to pick one;
- * if there are none, the user is prompted to add one. Finally,
- * an auth token is acquired for the chosen account.
+ *
+ * This method gets a list of the accounts matching specific type and feature set which are
+ * visible to the caller or for which user can grant access (see {@link #getAccountsByType} for
+ * details); if there is exactly one already visible account, it is used; if there are some
+ * accounts for which user grant visibility, the user is prompted to pick one; if there are
+ * none, the user is prompted to add one. Finally, an auth token is acquired for the chosen
+ * account.
*
- * This method may be called from any thread, but the returned
- * {@link AccountManagerFuture} must not be used on the main thread.
+ *
+ * This method may be called from any thread, but the returned {@link AccountManagerFuture} must
+ * not be used on the main thread.
*
- * NOTE: If targeting your app to work on API level 22 and before,
- * MANAGE_ACCOUNTS permission is needed for those platforms. See docs for
- * this function in API level 22.
+ *
+ * NOTE: If targeting your app to work on API level 22 and before, MANAGE_ACCOUNTS
+ * permission is needed for those platforms. See docs for this function in API level 22.
*
- * @param accountType The account type required
- * (see {@link #getAccountsByType}), must not be null
- * @param authTokenType The desired auth token type
- * (see {@link #getAuthToken}), must not be null
- * @param features Required features for the account
- * (see {@link #getAccountsByTypeAndFeatures}), may be null or empty
- * @param activity The {@link Activity} context to use for launching new
- * sub-Activities to prompt to add an account, select an account,
- * and/or enter a password, as necessary; used only to call
- * startActivity(); should not be null
- * @param addAccountOptions Authenticator-specific options to use for
- * adding new accounts; may be null or empty
- * @param getAuthTokenOptions Authenticator-specific options to use for
- * getting auth tokens; may be null or empty
- * @param callback Callback to invoke when the request completes,
- * null for no callback
- * @param handler {@link Handler} identifying the callback thread,
- * null for the main thread
- * @return An {@link AccountManagerFuture} which resolves to a Bundle with
- * at least the following fields:
- * As long as this listener is present, the AccountManager instance
- * will not be garbage-collected, and neither will the {@link Context}
- * used to retrieve it, which may be a large Activity instance. To avoid
- * memory leaks, you must remove this listener before then. Normally
- * listeners are added in an Activity or Service's {@link Activity#onCreate}
- * and removed in {@link Activity#onDestroy}.
+ *
+ * As long as this listener is present, the AccountManager instance will not be
+ * garbage-collected, and neither will the {@link Context} used to retrieve it, which may be a
+ * large Activity instance. To avoid memory leaks, you must remove this listener before then.
+ * Normally listeners are added in an Activity or Service's {@link Activity#onCreate} and
+ * removed in {@link Activity#onDestroy}.
*
- * The listener will only be informed of accounts that would be returned
- * to the caller via {@link #getAccounts()}. Typically this means that to
- * get any accounts, the caller will need to be grated the GET_ACCOUNTS
- * permission.
*
- * It is safe to call this method from the main thread.
+ * If SUPPORTED_ACCOUNT_TYPES is specified in the manifest file, listener will only be
+ * notified about whitelisted types.
+ *
+ *
+ * It is safe to call this method from the main thread.
*
* @param listener The listener to send notifications to
- * @param handler {@link Handler} identifying the thread to use
- * for notifications, null for the main thread
- * @param updateImmediately If true, the listener will be invoked
- * (on the handler thread) right away with the current account list
+ * @param handler {@link Handler} identifying the thread to use for notifications, null for the
+ * main thread
+ * @param updateImmediately If true, the listener will be invoked (on the handler thread) right
+ * away with the current account list
* @throws IllegalArgumentException if listener is null
* @throws IllegalStateException if listener was already added
*/
- @RequiresPermission(GET_ACCOUNTS)
public void addOnAccountsUpdatedListener(final OnAccountsUpdateListener listener,
Handler handler, boolean updateImmediately) {
if (listener == null) {
@@ -2729,21 +2954,46 @@ public class AccountManager {
mAccountsUpdatedListeners.put(listener, handler);
+
if (wasEmpty) {
// Register a broadcast receiver to monitor account changes
IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction(LOGIN_ACCOUNTS_CHANGED_ACTION);
+ if (isVisibleAccountsChangedBroadcastSupported()) {
+ intentFilter.addAction(ACTION_VISIBLE_ACCOUNTS_CHANGED);
+ } else {
+ intentFilter.addAction(LOGIN_ACCOUNTS_CHANGED_ACTION);
+ }
// To recover from disk-full.
intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
+ // Register a broadcast receiver to monitor account changes
mContext.registerReceiver(mAccountsChangedBroadcastReceiver, intentFilter);
}
}
-
if (updateImmediately) {
postToHandler(handler, listener, getAccounts());
}
}
+ /**
+ * @hide
+ */
+ private boolean isVisibleAccountsChangedBroadcastSupported() {
+ String interestedTypes = null;
+ try {
+ String packageName = mContext.getOpPackageName();
+ ApplicationInfo ai = mContext.getPackageManager().getApplicationInfo(packageName,
+ PackageManager.GET_META_DATA);
+ Bundle b = ai.metaData;
+ if (b == null) {
+ return false;
+ }
+ interestedTypes = b.getString(SUPPORTED_ACCOUNT_TYPES);
+ } catch (PackageManager.NameNotFoundException e) {
+ return false;
+ }
+ return !TextUtils.isEmpty(interestedTypes);
+ }
+
/**
* Removes an {@link OnAccountsUpdateListener} previously registered with
* {@link #addOnAccountsUpdatedListener}. The listener will no longer
diff --git a/core/java/android/accounts/IAccountManager.aidl b/core/java/android/accounts/IAccountManager.aidl
index fc10990c68670..66c3ca31afdb6 100644
--- a/core/java/android/accounts/IAccountManager.aidl
+++ b/core/java/android/accounts/IAccountManager.aidl
@@ -24,6 +24,8 @@ import android.os.Bundle;
import android.os.RemoteCallback;
import android.os.UserHandle;
+import java.util.Map;
+
/**
* Central application service that provides account management.
* @hide
@@ -106,18 +108,17 @@ interface IAccountManager {
void isCredentialsUpdateSuggested(in IAccountManagerResponse response, in Account account,
String statusToken);
- /* Allows Authenticator to view what packages or UIDs on phone have requested it. */
+ /* Allows Authenticator to get UIDs of packages which registered to receive updates about given account type.*/
int[] getRequestingUidsForType(String accountType);
- /* Allows authenticator to add an account explicitly that is only visible to
- certain uids; the authenticator learns of these UIDs */
- boolean addAccountExplicitlyWithUid(in Account account, String password, in Bundle extras,
- in int[] selectedUids);
+ boolean addAccountExplicitlyWithVisibility(in Account account, String password, in Bundle extras,
+ in Map visibility);
- /* Controls visibility of UIDs of applications to Accounts */
- boolean removeAccountVisibility(in Account a, in int uid);
- boolean makeAccountVisible(in Account a, in int uid);
- boolean isAccountVisible(in Account a, in int uid);
+ boolean setAccountVisibility(in Account a, int uid, int newVisibility);
+ int getAccountVisibility(in Account a, int uid);
+
+ /* Type may be null returns Map
+ *
+ *
+ *
- *
+ * @param accountType The account type required (see {@link #getAccountsByType}), must not be
+ * null
+ * @param authTokenType The desired auth token type (see {@link #getAuthToken}), must not be
+ * null
+ * @param features Required features for the account (see
+ * {@link #getAccountsByTypeAndFeatures}), may be null or empty
+ * @param activity The {@link Activity} context to use for launching new sub-Activities to
+ * prompt to add an account, select an account, and/or enter a password, as necessary;
+ * used only to call startActivity(); should not be null
+ * @param addAccountOptions Authenticator-specific options to use for adding new accounts; may
+ * be null or empty
+ * @param getAuthTokenOptions Authenticator-specific options to use for getting auth tokens; may
+ * be null or empty
+ * @param callback Callback to invoke when the request completes, null for no callback
+ * @param handler {@link Handler} identifying the callback thread, null for the main thread
+ * @return An {@link AccountManagerFuture} which resolves to a Bundle with at least the
+ * following fields:
+ *
+ *
*
- * If an error occurred, {@link AccountManagerFuture#getResult()} throws:
- *
- *
+ * If an error occurred, {@link AccountManagerFuture#getResult()} throws:
+ *
+ *
*/
public AccountManagerFuture