Merge "Check for FEATURE_TELEPHONY_SUBSCRIPTION for new SubscriptionMgr API calls." into main (39884db7) · Commits · e / os / android_packages_services_Telecomm

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -2188,6 +2188,10 @@ public class CallsManager extends Call.ListenerBase
		// At some point, Telecom and Telephony are out of sync with the default
		// outgoing calling account.
		if(mFeatureFlags.telephonyHasDefaultButTelecomDoesNot()) {
		// SubscriptionManager will throw if FEATURE_TELEPHONY_SUBSCRIPTION
		// is not present.
		if (mContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
		if (SubscriptionManager.getDefaultVoiceSubscriptionId() !=
		SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		mAnomalyReporter.reportAnomaly(
		@@ -2195,6 +2199,7 @@ public class CallsManager extends Call.ListenerBase
		TELEPHONY_HAS_DEFAULT_BUT_TELECOM_DOES_NOT_MSG);
		}
		}
		}

		// This is the state where the user is expected to select an account
		callToPlace.setState(CallState.SELECT_PHONE_ACCOUNT,

+6 −1

Original line number	Diff line number	Diff line
		@@ -1841,7 +1841,12 @@ public class PhoneAccountRegistrar {
		} else {
		pw.println(defaultOutgoing);
		}
		pw.println("defaultVoiceSubId: " + SubscriptionManager.getDefaultVoiceSubscriptionId());
		// SubscriptionManager will throw if FEATURE_TELEPHONY_SUBSCRIPTION is not present.
		if (mContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
		pw.println("defaultVoiceSubId: "
		+ SubscriptionManager.getDefaultVoiceSubscriptionId());
		}
		pw.println("simCallManager: " + getSimCallManager(mCurrentUserHandle));
		pw.println("phoneAccounts:");
		pw.increaseIndent();