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

Commit 235f60bc authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 4143b796: Merge "Fixing conference merge where only one party is added to... 

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

* commit '4143b796':
  Fixing conference merge where only one party is added to conference.
parents c6fc5287 4143b796

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

        }

    }

}