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

Commit 4e47e27d authored Nov 15, 2014 by Anthony Lee

Register for supplemental service failures in CallManager.

This is to enabled the plumbing for us to show the user an error
message when conference calls fail to merge.

Bug: 18080792
Change-Id: Ie301eac647967cbd38e66c7cdd1cb333b99adb45

parent 5db65ca0

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -641,6 +641,7 @@ public final class CallManager {
		// for events supported only by IMS phone
		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
		phone.registerForOnHoldTone(handler, EVENT_ONHOLD_TONE, null);
		phone.registerForSuppServiceFailed(handler, EVENT_SUPP_SERVICE_FAILED, null);
		}
		}

		@@ -690,6 +691,7 @@ public final class CallManager {
		// for events supported only by IMS phone
		if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
		phone.unregisterForOnHoldTone(handler);
		phone.unregisterForSuppServiceFailed(handler);
		}
		}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1

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

		@Override
		public void onCallMergeFailed(ImsCall call, ImsReasonInfo reasonInfo) {
		if (DBG) log("onCallMergeFailed reasonCode=" + reasonInfo.getCode());
		if (DBG) log("onCallMergeFailed reasonInfo=" + reasonInfo);
		mPhone.notifySuppServiceFailed(Phone.SuppService.CONFERENCE);
		}