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

Commit a6716a4b authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "limit TelecomManager#registerPhoneAccount to 10" into qt-dev am: aea733a5 am: df85b72d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16905018



Change-Id: I7b8dbe363319a1be7c80605f6cf64bdc1390471a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df451bd5 df85b72d

src/com/android/server/telecom/PhoneAccountRegistrar.java

+21 −2
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class PhoneAccountRegistrar { 
    public static final String FILE_NAME = "phone-account-registrar-state.xml";

    @VisibleForTesting

    public static final int EXPECTED_STATE_VERSION = 9;

    public static final int MAX_PHONE_ACCOUNT_REGISTRATIONS = 10;



    /** Keep in sync with the same in SipSettings.java */

    private static final String SIP_SHARED_PREFERENCES = "SIP_PREFERENCES";
@@ -764,8 +765,13 @@ public class PhoneAccountRegistrar { 
        return account.isSelfManaged();

    }



    // TODO: Should we implement an artificial limit for # of accounts associated with a single

    // ComponentName?

    /**

     * Performs checks before calling addOrReplacePhoneAccount(PhoneAccount)

     *

     * @param account The {@code PhoneAccount} to add or replace.

     * @throws SecurityException if package does not have BIND_TELECOM_CONNECTION_SERVICE permission

     * @throws IllegalArgumentException if MAX_PHONE_ACCOUNT_REGISTRATIONS are reached

     */

    public void registerPhoneAccount(PhoneAccount account) {

        // Enforce the requirement that a connection service for a phone account has the correct

        // permission.
@@ -776,6 +782,19 @@ public class PhoneAccountRegistrar { 
            throw new SecurityException("PhoneAccount connection service requires "

                    + "BIND_TELECOM_CONNECTION_SERVICE permission.");

        }

        //Enforce an upper bound on the number of PhoneAccount's a package can register.

        // Most apps should only require 1-2.

        if (getPhoneAccountsForPackage(

                account.getAccountHandle().getComponentName().getPackageName(),

                account.getAccountHandle().getUserHandle()).size()

                >= MAX_PHONE_ACCOUNT_REGISTRATIONS) {

            Log.w(this, "Phone account %s reached max registration limit for package",

                    account.getAccountHandle());

            throw new IllegalArgumentException(

                    "Error, cannot register phone account " + account.getAccountHandle()

                            + " because the limit, " + MAX_PHONE_ACCOUNT_REGISTRATIONS

                            + ", has been reached");

        }



        addOrReplacePhoneAccount(account);

    }