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

Commit 8a34d9ed authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev

parents 49367a36 01568675
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
@@ -834,24 +834,6 @@ public abstract class ConnectionService extends Service {
     */
    public void onConference(Connection connection1, Connection connection2) {}

    /**
     * Notifies that a connection has been added to this connection service and sent to Telecomm.
     *
     * @param connection The connection which was added.
     */
    public void onConnectionAdded(Connection connection) {}

    /**
     * Notified that a connection has been removed from this connection service.
     * <p>
     * TODO: Deprecate this since we can listen to the Connection onDestroyed() to determine when
     * it is destroyed. This then percolates down to the RemoteConference stuff, where we can also
     * have a callback for one being added, but we don't need one for being destroyed.
     *
     * @param connection The connection which was removed.
     */
    public void onConnectionRemoved(Connection connection) {}

    public void onRemoteConferenceAdded(RemoteConference conference) {}

    /**
@@ -879,7 +861,6 @@ public abstract class ConnectionService extends Service {
        mIdByConnection.put(connection, callId);
        connection.addConnectionListener(mConnectionListener);
        connection.setConnectionService(this);
        onConnectionAdded(connection);
    }

    private void removeConnection(Connection connection) {
@@ -888,7 +869,6 @@ public abstract class ConnectionService extends Service {
        connection.removeConnectionListener(mConnectionListener);
        mConnectionById.remove(mIdByConnection.get(connection));
        mIdByConnection.remove(connection);
        onConnectionRemoved(connection);
        mAdapter.removeCall(id);
    }