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

Commit d331e4ec authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Support disconnecting conference participants from conference." into...

Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5c
automerge: 0bfb97cd

* commit '0bfb97cd':
  Support disconnecting conference participants from conference.
parents 80ae2850 0bfb97cd
Loading
Loading
Loading
Loading
+9 −0
Original line number Original line Diff line number Diff line
@@ -973,6 +973,15 @@ public abstract class Connection {
     */
     */
    public void onDisconnect() {}
    public void onDisconnect() {}


    /**
     * Notifies this Connection of a request to disconnect a participant of the conference managed
     * by the connection.
     *
     * @param endpoint the {@link Uri} of the participant to disconnect.
     * @hide
     */
    public void onDisconnectConferenceParticipant(Uri endpoint) {}

    /**
    /**
     * Notifies this Connection of a request to separate from its parent conference.
     * Notifies this Connection of a request to separate from its parent conference.
     */
     */