Merge cherrypicks of ['ag/20750208'] into security-aosp-rvc-release. (7cc2b669) · Commits · e / os / android_frameworks_base

core/java/android/accounts/Account.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.util.Log;

		import com.android.internal.annotations.GuardedBy;

		import java.util.Objects;
		import java.util.Set;

		/**
		@@ -86,12 +85,6 @@ public class Account implements Parcelable {
		if (TextUtils.isEmpty(type)) {
		throw new IllegalArgumentException("the type must not be empty: " + type);
		}
		if (name.length() > 200) {
		throw new IllegalArgumentException("account name is longer than 200 characters");
		}
		if (type.length() > 200) {
		throw new IllegalArgumentException("account type is longer than 200 characters");
		}
		this.name = name;
		this.type = type;
		this.accessId = accessId;

+0 −5

Original line number	Diff line number	Diff line
		@@ -1821,11 +1821,6 @@ public class AccountManagerService
		+ ", skipping since the account already exists");
		return false;
		}
		if (accounts.accountsDb.findAllDeAccounts().size() > 100) {
		Log.w(TAG, "insertAccountIntoDatabase: " + account.toSafeString()
		+ ", skipping since more than 50 accounts on device exist");
		return false;
		}
		long accountId = accounts.accountsDb.insertCeAccount(account, password);
		if (accountId < 0) {
		Log.w(TAG, "insertAccountIntoDatabase: " + account.toSafeString()