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

Commit 53167537 authored by Anthony Lee's avatar Anthony Lee Committed by Android (Google) Code Review
Browse files

Merge "Register for supplemental service failures in CallManager." into lmp-mr1-dev

parents e9455c22 4e47e27d

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

        }