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

Commit a70688f2 authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev

parents 3ed9f2f9 46f7f5dc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28115,6 +28115,7 @@ package android.telecom { 
    method public android.telecom.Connection getPrimaryConnection();

    method public final int getState();

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

    method public void onConnectionAdded(android.telecom.Connection);

    method public void onDisconnect();

    method public void onHold();

    method public void onMerge(android.telecom.Connection);
@@ -28153,7 +28154,6 @@ package android.telecom { 
    method public void onAbort();

    method public void onAnswer();

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

    method public void onConferenceChanged();

    method public void onDisconnect();

    method public void onHold();

    method public void onPlayDtmfTone(char);

telecomm/java/android/telecom/Conference.java

+8 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ public abstract class Conference { 
     */

    public void onAudioStateChanged(AudioState state) {}



    /**

     * Notifies this conference that a connection has been added to it.

     *

     * @param connection The newly added connection.

     */

    public void onConnectionAdded(Connection connection) {}



    /**

     * Sets state to be on hold.

     */
@@ -238,6 +245,7 @@ public abstract class Conference { 
        if (connection != null && !mChildConnections.contains(connection)) {

            if (connection.setConference(this)) {

                mChildConnections.add(connection);

                onConnectionAdded(connection);

                for (Listener l : mListeners) {

                    l.onConnectionAdded(this, connection);

                }

telecomm/java/android/telecom/Connection.java

+0 −7
Original line number Diff line number Diff line
@@ -921,7 +921,6 @@ public abstract class Connection { 
            mConference = conference;

            if (mConnectionService != null && mConnectionService.containsConference(conference)) {

                fireConferenceChanged();

                onConferenceChanged();

            }

            return true;

        }
@@ -937,7 +936,6 @@ public abstract class Connection { 
            Log.d(this, "Conference reset");

            mConference = null;

            fireConferenceChanged();

            onConferenceChanged();

        }

    }
@@ -1030,11 +1028,6 @@ public abstract class Connection { 
     */

    public void onPostDialContinue(boolean proceed) {}



    /**

     * Notifies this Connection that the conference which is set on it has changed.

     */

    public void onConferenceChanged() {}



    static String toLogSafePhoneNumber(String number) {

        // For unknown number, log empty string.

        if (number == null) {