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

Commit ac5c1275 authored by Thomas Stuart's avatar Thomas Stuart
Browse files

rm only_update_telephony_on_valid_sub_ids flag from CTS 

Removing all references to only_update_telephony_on_valid_sub_ids as
a part of a cleanup effort.  Falgged changes can be found in
ag/24719546 and ag/24722567

Flag: EXEMPT flag cleanup
Fixes: 409611934
Test: atest CtsTelecomTestCases
Change-Id: I66ef117f55f26662a38371e3e8093372b0af9a13
parent ef4eda12

flags/telecom_default_phone_account_flags.aconfig

+0 −8
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"

container: "system"



# OWNER=tjstuart TARGET=24Q3

flag {

  name: "only_update_telephony_on_valid_sub_ids"

  namespace: "telecom"

  description: "For testing purposes, only update Telephony when the default calling subId is non-zero"

  bug: "234846282"

}



# OWNER=tjstuart TARGET=24Q3

flag {

  name: "telephony_has_default_but_telecom_does_not"

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

+3 −12
Original line number Diff line number Diff line
@@ -418,20 +418,11 @@ public class PhoneAccountRegistrar { 
        // Telecom are in sync.

        int newSubId = accountHandle == null ? SubscriptionManager.INVALID_SUBSCRIPTION_ID :

                getSubscriptionIdForPhoneAccount(accountHandle);

        if (Flags.onlyUpdateTelephonyOnValidSubIds()) {

        if (shouldUpdateTelephonyDefaultVoiceSubId(accountHandle, isSimAccount, newSubId)) {

            updateDefaultVoiceSubId(newSubId, accountHandle);

        } else {

            Log.i(this, "setUserSelectedOutgoingPhoneAccount: %s is not a sub", accountHandle);

        }

        } else {

            if (isSimAccount || accountHandle == null) {

                updateDefaultVoiceSubId(newSubId, accountHandle);

            } else {

                Log.i(this, "setUserSelectedOutgoingPhoneAccount: %s is not a sub", accountHandle);

            }

        }



        write();

        fireDefaultOutgoingChanged();

    }

tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase { 
        mRegistrar = new PhoneAccountRegistrar(

                mComponentContextFixture.getTestDouble().getApplicationContext(), mLock, FILE_NAME,

                mDefaultDialerCache, mAppLabelProxy, mTelephonyFeatureFlags, mFeatureFlags);

        when(mFeatureFlags.onlyUpdateTelephonyOnValidSubIds()).thenReturn(false);

        when(mFeatureFlags.unregisterUnresolvableAccounts()).thenReturn(true);

        when(mTelephonyFeatureFlags.workProfileApiSplit()).thenReturn(false);

        when(mFeatureFlags.resolveHiddenDependenciesTwo()).thenReturn(true);