Make addExistingConnection MSIM aware am: 92d32918d8 am: bf3187aaeb (45adc7f6) · Commits · e / os / android_packages_services_Telecomm

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -823,9 +823,18 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		}
		// Allow the Sim call manager account as well, even if its disabled.
		if (phoneAccountHandle == null && callingPhoneAccountHandle != null) {
		if (callingPhoneAccountHandle.equals(
		mPhoneAccountRegistrar.getSimCallManager(userHandle))) {
		phoneAccountHandle = callingPhoneAccountHandle;
		// Search all SIM PhoneAccounts to see if there is a SIM call manager
		// associated with any of them and verify that the calling handle matches.
		for (PhoneAccountHandle handle :
		mPhoneAccountRegistrar.getSimPhoneAccounts(userHandle)) {
		int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(
		handle);
		PhoneAccountHandle connectionMgrHandle =
		mPhoneAccountRegistrar.getSimCallManager(subId, userHandle);
		if (callingPhoneAccountHandle.equals(connectionMgrHandle)) {
		phoneAccountHandle = connectionMgrHandle;
		break;
		}
		}
		}
		if (phoneAccountHandle != null) {