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

Commit 5c43813b authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 3f5a43b2: Merge "Conference event package performance improvement." into... 

am 3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge: af7dfdda

* commit '3f5a43b2':
  Conference event package performance improvement.
parents aa1f9804 3f5a43b2

telecomm/java/android/telecom/Connection.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -83,8 +83,8 @@ public abstract class Connection { 
                Connection c, List<Connection> conferenceableConnections) {}

                Connection c, List<Connection> conferenceableConnections) {}

        public void onConferenceChanged(Connection c, Conference conference) {}

        public void onConferenceChanged(Connection c, Conference conference) {}

        /** @hide */

        /** @hide */

        public void onConferenceParticipantChanged(Connection c, ConferenceParticipant participant)

        public void onConferenceParticipantsChanged(Connection c,

        {}

                List<ConferenceParticipant> participants) {}

    }

    }





    /** @hide */

    /** @hide */
@@ -1124,14 +1124,15 @@ public abstract class Connection { 
    }

    }





    /**

    /**

     * Notifies listeners of a change to a conference participant.

     * Notifies listeners of a change to conference participant(s).

     *

     *

     * @param conferenceParticipant The participant.

     * @param conferenceParticipants The participants.

     * @hide

     * @hide

     */

     */

    protected final void updateConferenceParticipant(ConferenceParticipant conferenceParticipant) {

    protected final void updateConferenceParticipants(

            List<ConferenceParticipant> conferenceParticipants) {

        for (Listener l : mListeners) {

        for (Listener l : mListeners) {

            l.onConferenceParticipantChanged(this, conferenceParticipant);

            l.onConferenceParticipantsChanged(this, conferenceParticipants);

        }

        }

    }

    }

}
 
}