Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f56fa96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent apps from spamming addAccountExplicitly. See comment here for... 

Merge "Prevent apps from spamming addAccountExplicitly. See comment here for the discussion on solution https://b.corp.google.com/issues/169762606#comment14" into rvc-qpr-dev am: 54c29aa7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640700

Change-Id: I18503535c0ff31b561a7429881e86779cafaa0d3
parents d3869be1 54c29aa7

core/java/android/accounts/Account.java

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


import com.android.internal.annotations.GuardedBy;



import java.util.Objects;

import java.util.Set;



/**
@@ -86,6 +87,12 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,11 @@ 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()