Merge "remove the hack to delay the accounts changed intent for the first account" (fb461560) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountManagerService.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -82,8 +82,6 @@ public class AccountManagerService
		implements RegisteredServicesCacheListener<AuthenticatorDescription> {
		private static final String GOOGLE_ACCOUNT_TYPE = "com.google";

		private static final String NO_BROADCAST_FLAG = "nobroadcast";

		private static final String TAG = "AccountManagerService";

		private static final int TIMEOUT_DELAY_MS = 1000 * 60;
		@@ -375,14 +373,6 @@ public class AccountManagerService
		if (account == null) {
		return false;
		}
		final boolean noBroadcast = account.type.equals(GOOGLE_ACCOUNT_TYPE)
		&& extras != null && extras.getBoolean(NO_BROADCAST_FLAG, false);
		// Remove the 'nobroadcast' flag since we don't want it to persist in the db. It is instead
		// used as a control signal to indicate whether or not this insertion should result in
		// an accounts changed broadcast being sent.
		if (extras != null) {
		extras.remove(NO_BROADCAST_FLAG);
		}
		db.beginTransaction();
		try {
		long numMatches = DatabaseUtils.longForQuery(db,
		@@ -419,9 +409,7 @@ public class AccountManagerService
		} finally {
		db.endTransaction();
		}
		if (!noBroadcast) {
		sendAccountsChangedBroadcast();
		}
		return true;
		}

		@@ -776,10 +764,6 @@ public class AccountManagerService
		if (account == null) throw new IllegalArgumentException("account is null");
		checkAuthenticateAccountsPermission(account);
		long identityToken = clearCallingIdentity();
		if (account.type.equals(GOOGLE_ACCOUNT_TYPE) && key.equals("broadcast")) {
		sendAccountsChangedBroadcast();
		return;
		}
		try {
		writeUserdataIntoDatabase(account, key, value);
		} finally {