diff options
author | Nancy Chen <nancychen@google.com> | 2014-09-03 18:41:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 18:41:21 +0000 |
commit | 8a34d9ed2a084db94b47ff597df2efb02e765d78 (patch) | |
tree | 2257c6aad0ee83fd6cdb9fe218eceddbb7b5e0eb /telecomm | |
parent | 49367a367c97991d58d723f602afc4b402e62b00 (diff) | |
parent | 0156867544453076a7bb55194cbbdc87edbb7fd5 (diff) | |
download | frameworks_base-8a34d9ed2a084db94b47ff597df2efb02e765d78.zip frameworks_base-8a34d9ed2a084db94b47ff597df2efb02e765d78.tar.gz frameworks_base-8a34d9ed2a084db94b47ff597df2efb02e765d78.tar.bz2 |
Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev
Diffstat (limited to 'telecomm')
-rw-r--r-- | telecomm/java/android/telecomm/ConnectionService.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java index 19cf622..b96b4e6 100644 --- a/telecomm/java/android/telecomm/ConnectionService.java +++ b/telecomm/java/android/telecomm/ConnectionService.java @@ -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); } |