Ads per-user APIs to manage accounts through the AccountManager (999d394a) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountManager.java

+59 −6

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@ public class AccountManager {

		/** @hide */
		public static final int ERROR_CODE_USER_RESTRICTED = 100;
		/** @hide */
		public static final int ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE = 101;

		/**
		* Bundle key used for the {@link String} account name in results
		@@ -678,8 +680,7 @@ public class AccountManager {
		* @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 has been successfully removed,
		* false if the authenticator forbids deleting this account.
		* true if the account has been successfully removed
		*/
		public AccountManagerFuture<Boolean> removeAccount(final Account account,
		AccountManagerCallback<Boolean> callback, Handler handler) {
		@@ -697,6 +698,28 @@ public class AccountManager {
		}.start();
		}

		/**
		* @see #removeAccount(Account, AccountManagerCallback, Handler)
		* @hide
		*/
		public AccountManagerFuture<Boolean> removeAccountAsUser(final Account account,
		AccountManagerCallback<Boolean> callback, Handler handler,
		final UserHandle userHandle) {
		if (account == null) throw new IllegalArgumentException("account is null");
		if (userHandle == null) throw new IllegalArgumentException("userHandle is null");
		return new Future2Task<Boolean>(handler, callback) {
		public void doWork() throws RemoteException {
		mService.removeAccountAsUser(mResponse, account, userHandle.getIdentifier());
		}
		public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException {
		if (!bundle.containsKey(KEY_BOOLEAN_RESULT)) {
		throw new AuthenticatorException("no result in response");
		}
		return bundle.getBoolean(KEY_BOOLEAN_RESULT);
		}
		}.start();
		}

		/**
		* Removes an auth token from the AccountManager's cache. Does nothing if
		* the auth token is not currently in the cache. Applications must call this
		@@ -1183,7 +1206,8 @@ public class AccountManager {
		* <li> {@link AuthenticatorException} if no authenticator was registered for
		* this account type or the authenticator failed to respond
		* <li> {@link OperationCanceledException} if the operation was canceled for
		* any reason, including the user canceling the creation process
		* any reason, including the user canceling the creation process or adding accounts
		* (of this type) has been disabled by policy
		* <li> {@link IOException} if the authenticator experienced an I/O problem
		* creating a new account, usually because of network trouble
		* </ul>
		@@ -1207,6 +1231,30 @@ public class AccountManager {
		}.start();
		}

		/**
		* @see #addAccount(String, String, String[], Bundle, Activity, AccountManagerCallback, Handler)
		* @hide
		*/
		public AccountManagerFuture<Bundle> addAccountAsUser(final String accountType,
		final String authTokenType, final String[] requiredFeatures,
		final Bundle addAccountOptions, final Activity activity,
		AccountManagerCallback<Bundle> callback, Handler handler, final UserHandle userHandle) {
		if (accountType == null) throw new IllegalArgumentException("accountType is null");
		if (userHandle == null) throw new IllegalArgumentException("userHandle is null");
		final Bundle optionsIn = new Bundle();
		if (addAccountOptions != null) {
		optionsIn.putAll(addAccountOptions);
		}
		optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());

		return new AmsTask(activity, handler, callback) {
		public void doWork() throws RemoteException {
		mService.addAccountAsUser(mResponse, accountType, authTokenType,
		requiredFeatures, activity != null, optionsIn, userHandle.getIdentifier());
		}
		}.start();
		}

		/**
		* Adds a shared account from the primary user to a secondary user. Adding the shared account
		* doesn't take effect immediately. When the target user starts up, any pending shared accounts
		@@ -1608,8 +1656,10 @@ public class AccountManager {
		}

		public void onError(int code, String message) {
		if (code == ERROR_CODE_CANCELED \|\| code == ERROR_CODE_USER_RESTRICTED) {
		// the authenticator indicated that this request was canceled, do so now
		if (code == ERROR_CODE_CANCELED \|\| code == ERROR_CODE_USER_RESTRICTED
		\|\| code == ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE) {
		// the authenticator indicated that this request was canceled or we were
		// forbidden to fulfill; cancel now
		cancel(true /* mayInterruptIfRunning */);
		return;
		}
		@@ -1668,7 +1718,10 @@ public class AccountManager {
		}

		public void onError(int code, String message) {
		if (code == ERROR_CODE_CANCELED) {
		if (code == ERROR_CODE_CANCELED \|\| code == ERROR_CODE_USER_RESTRICTED
		\|\| code == ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE) {
		// the authenticator indicated that this request was canceled or we were
		// forbidden to fulfill; cancel now
		cancel(true /* mayInterruptIfRunning */);
		return;
		}

core/java/android/accounts/AccountManagerFuture.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ public interface AccountManagerFuture<V> {
		* will be thrown rather than the call returning normally.
		* @return the actual result
		* @throws android.accounts.OperationCanceledException if the request was canceled for any
		* reason
		* reason (including if it is forbidden
		* by policy to modify an account (of that type))
		* @throws android.accounts.AuthenticatorException if there was an error communicating with
		* the authenticator or if the authenticator returned an invalid response
		* @throws java.io.IOException if the authenticator returned an error response that indicates

core/java/android/accounts/CantAddAccountActivity.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.accounts;
		import android.app.Activity;
		import android.os.Bundle;
		import android.view.View;
		import android.widget.TextView;

		import com.android.internal.R;

		@@ -27,11 +28,26 @@ import com.android.internal.R;
		* Just shows an error message about the account restrictions for the limited user.
		*/
		public class CantAddAccountActivity extends Activity {
		public static final String EXTRA_ERROR_CODE = "android.accounts.extra.ERROR_CODE";
		public static final int MISSING = -1;

		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.app_not_authorized);

		int errorCode = getIntent().getIntExtra(EXTRA_ERROR_CODE, MISSING);
		if (errorCode != MISSING) {
		TextView errorText = (TextView) findViewById(R.id.description);
		switch (errorCode) {
		case AccountManager.ERROR_CODE_USER_RESTRICTED:
		errorText.setText(R.string.app_no_restricted_accounts);
		break;
		default:
		// TODO: Get better message. See: http://b/14642886
		errorText.setText(R.string.error_message_title);
		}
		}
		}

		public void onCancelButtonClicked(View view) {

core/java/android/accounts/IAccountManager.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ interface IAccountManager {
		void getAccountsByFeatures(in IAccountManagerResponse response, String accountType, in String[] features);
		boolean addAccountExplicitly(in Account account, String password, in Bundle extras);
		void removeAccount(in IAccountManagerResponse response, in Account account);
		void removeAccountAsUser(in IAccountManagerResponse response, in Account account, int userId);
		void invalidateAuthToken(String accountType, String authToken);
		String peekAuthToken(in Account account, String authTokenType);
		void setAuthToken(in Account account, String authTokenType, String authToken);
		@@ -52,6 +53,9 @@ interface IAccountManager {
		void addAccount(in IAccountManagerResponse response, String accountType,
		String authTokenType, in String[] requiredFeatures, boolean expectActivityLaunch,
		in Bundle options);
		void addAccountAsUser(in IAccountManagerResponse response, String accountType,
		String authTokenType, in String[] requiredFeatures, boolean expectActivityLaunch,
		in Bundle options, int userId);
		void updateCredentials(in IAccountManagerResponse response, in Account account,
		String authTokenType, boolean expectActivityLaunch, in Bundle options);
		void editProperties(in IAccountManagerResponse response, String accountType,

core/java/android/app/admin/DevicePolicyManager.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -2598,9 +2598,17 @@ public class DevicePolicyManager {
		* @see #setAccountManagementDisabled
		*/
		public String[] getAccountTypesWithManagementDisabled() {
		return getAccountTypesWithManagementDisabledAsUser(UserHandle.getCallingUserId());
		}

		/**
		* @see #getAccountTypesWithManagementDisabled()
		* @hide
		*/
		public String[] getAccountTypesWithManagementDisabledAsUser(int userId) {
		if (mService != null) {
		try {
		return mService.getAccountTypesWithManagementDisabled();
		return mService.getAccountTypesWithManagementDisabledAsUser(userId);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed talking with device policy service", e);
		}