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

Commit a55882e0 authored by Prerepa Viswanadham's avatar Prerepa Viswanadham
Browse files

Merge commit '52c1bebc' into alee_merge

parents 2595c2ac 52c1bebc

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

+13 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public abstract class Connection { 
        public void onConferenceParticipantsChanged(List<ConferenceParticipant> participants);

        public void onCallSubstateChanged(int callSubstate);

        public void onMultipartyStateChanged(boolean isMultiParty);

        public void onConferenceMergedFailed();

    }



    /**
@@ -77,6 +78,8 @@ public abstract class Connection { 
        public void onCallSubstateChanged(int callSubstate) {}

        @Override

        public void onMultipartyStateChanged(boolean isMultiParty) {}

        @Override

        public void onConferenceMergedFailed() {}

    }



    public static final int AUDIO_QUALITY_STANDARD = 1;
@@ -640,7 +643,7 @@ public abstract class Connection { 
    }



    /**

     * Notifies listeners of a change to the multiparty state of the connection..

     * Notifies listeners of a change to the multiparty state of the connection.

     *

     * @param isMultiparty The participant(s).

     */
@@ -650,6 +653,15 @@ public abstract class Connection { 
        }

    }



    /**

     * Notifies listeners of a failure in merging this connection with the background connection.

     */

    public void onConferenceMergeFailed() {

        for (Listener l : mListeners) {

            l.onConferenceMergedFailed();

        }

    }



    /**

     * Notifies this Connection of a request to disconnect a participant of the conference managed

     * by the connection.

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

+0 −2
Original line number Diff line number Diff line
@@ -1651,8 +1651,6 @@ public class SubscriptionController extends ISub.Stub { 
    }



    public boolean isActiveSubId(int subId) {

        enforceSubscriptionPermission();



        boolean retVal = SubscriptionManager.isValidSubscriptionId(subId)

                && sSlotIdxToSubId.containsValue(subId);

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

+11 −0
Original line number Diff line number Diff line
@@ -1206,7 +1206,18 @@ public final class ImsPhoneCallTracker extends CallTracker { 
        @Override

        public void onCallMergeFailed(ImsCall call, ImsReasonInfo reasonInfo) {

            if (DBG) log("onCallMergeFailed reasonInfo=" + reasonInfo);



            // TODO: the call to notifySuppServiceFailed throws up the "merge failed" dialog

            // We should move this into the InCallService so that it is handled appropriately

            // based on the user facing UI.

            mPhone.notifySuppServiceFailed(Phone.SuppService.CONFERENCE);



            // Start plumbing this even through Telecom so other components can take

            // appropriate action.

            ImsPhoneConnection conn = findConnection(call);

            if (conn != null) {

                conn.onConferenceMergeFailed();

            }

        }



        /**