Merge cherrypicks of ['ag/20763606'] into security-aosp-rvc-release. (8f4aaa7e) · 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;

services/core/java/com/android/server/accounts/AccountManagerService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1807,6 +1807,14 @@ public class AccountManagerService
		if (account == null) {
		return false;
		}
		if (account.name != null && account.name.length() > 200) {
		Log.w(TAG, "Account cannot be added - Name longer than 200 chars");
		return false;
		}
		if (account.type != null && account.type.length() > 200) {
		Log.w(TAG, "Account cannot be added - Name longer than 200 chars");
		return false;
		}
		if (!isLocalUnlockedUser(accounts.userId)) {
		Log.w(TAG, "Account " + account.toSafeString() + " cannot be added - user "
		+ accounts.userId + " is locked. callingUid=" + callingUid);
		@@ -2000,6 +2008,10 @@ public class AccountManagerService
		+ ", pid " + Binder.getCallingPid());
		}
		if (accountToRename == null) throw new IllegalArgumentException("account is null");
		if (newName != null && newName.length() > 200) {
		Log.e(TAG, "renameAccount failed - account name longer than 200");
		throw new IllegalArgumentException("account name longer than 200");
		}
		int userId = UserHandle.getCallingUserId();
		if (!isAccountManagedByCaller(accountToRename.type, callingUid, userId)) {
		String msg = String.format(

services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.accounts.CantAddAccountActivity;
		import android.accounts.IAccountManagerResponse;
		import android.app.AppOpsManager;
		import android.app.INotificationManager;
		import android.app.PropertyInvalidatedCache;
		import android.app.admin.DevicePolicyManager;
		import android.app.admin.DevicePolicyManagerInternal;
		import android.content.BroadcastReceiver;
		@@ -132,6 +133,8 @@ public class AccountManagerServiceTest extends AndroidTestCase {
		protected void setUp() throws Exception {
		MockitoAnnotations.initMocks(this);

		PropertyInvalidatedCache.disableForTestMode();

		when(mMockPackageManager.checkSignatures(anyInt(), anyInt()))
		.thenReturn(PackageManager.SIGNATURE_MATCH);
		final UserInfo ui = new UserInfo(UserHandle.USER_SYSTEM, "user0", 0);
		@@ -241,6 +244,25 @@ public class AccountManagerServiceTest extends AndroidTestCase {
		assertEquals(a31, accounts[1]);
		}

		@SmallTest
		public void testCheckAddAccountLongName() throws Exception {
		unlockSystemUser();
		String longString = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
		+ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
		+ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
		+ "aaaaa";
		Account a11 = new Account(longString, AccountManagerServiceTestFixtures.ACCOUNT_TYPE_1);

		mAms.addAccountExplicitly(a11, /* password= / "p11", / extras= */ null);

		String[] list = new String[]{AccountManagerServiceTestFixtures.CALLER_PACKAGE};
		when(mMockPackageManager.getPackagesForUid(anyInt())).thenReturn(list);
		Account[] accounts = mAms.getAccountsAsUser(null,
		UserHandle.getCallingUserId(), mContext.getOpPackageName());
		assertEquals(0, accounts.length);
		}


		@SmallTest
		public void testPasswords() throws Exception {
		unlockSystemUser();