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

Commit 4143b796 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

parents dcce25a9 8a2b1199

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30037,6 +30037,7 @@ package android.telecom { 
    method public final int getState();

    method public final android.telecom.StatusHints getStatusHints();

    method public final boolean isRingbackRequested();

    method protected void notifyConferenceStarted();

    method public void onAbort();

    method public void onAnswer();

    method public void onAudioStateChanged(android.telecom.AudioState);

telecomm/java/android/telecom/Connection.java

+10 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ public abstract class Connection implements IConferenceable { 
        /** @hide */

        public void onConferenceParticipantsChanged(Connection c,

                List<ConferenceParticipant> participants) {}

        public void onConferenceStarted() {}

    }



    /** @hide */
@@ -1422,4 +1423,13 @@ public abstract class Connection implements IConferenceable { 
            l.onConferenceParticipantsChanged(this, conferenceParticipants);

        }

    }



    /**

     * Notifies listeners that a conference call has been started.

     */

    protected void notifyConferenceStarted() {

        for (Listener l : mListeners) {

            l.onConferenceStarted();

        }

    }

}