Merge "rm only_update_telephony_on_valid_sub_ids flag from CTS" into main (68d3738c) · Commits · e / os / android_packages_services_Telecomm

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"

+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();
		}

+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);