Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev (8185c727) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/PhoneBase.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -87,12 +87,16 @@ public abstract class PhoneBase extends Handler implements Phone {
		private BroadcastReceiver mImsIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		// TODO: MSIM potentially replace SUBID with information available to external
		// service, e.g. slot ID
		if (intent.hasExtra(ImsManager.EXTRA_SUBID)) {
		if (intent.getLongExtra(ImsManager.EXTRA_SUBID, -1) != getSubId())
		Rlog.d(LOG_TAG, "mImsIntentReceiver: action " + intent.getAction());
		if (intent.hasExtra(ImsManager.EXTRA_PHONE_ID)) {
		int extraPhoneId = intent.getIntExtra(ImsManager.EXTRA_PHONE_ID,
		SubscriptionManager.INVALID_PHONE_INDEX);
		Rlog.d(LOG_TAG, "mImsIntentReceiver: extraPhoneId = " + extraPhoneId);
		if (extraPhoneId == SubscriptionManager.INVALID_PHONE_INDEX \|\|
		extraPhoneId != getPhoneId()) {
		return;
		}
		}

		if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_UP)) {
		mImsServiceReady = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ public final class ImsPhoneCallTracker extends CallTracker {

		private void getImsService() {
		if (DBG) log("getImsService");
		mImsManager = ImsManager.getInstance(mPhone.getContext(), mPhone.getSubId());
		mImsManager = ImsManager.getInstance(mPhone.getContext(), mPhone.getPhoneId());
		try {
		mServiceId = mImsManager.open(ImsServiceClass.MMTEL,
		createIncomingCallPendingIntent(),