diff --git a/api/current.txt b/api/current.txt index 3db9f6e65e6e7..a9bcf745056d9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28114,7 +28114,6 @@ package android.telecom { method public void onAbort(); method public void onAnswer(); method public void onAudioStateChanged(android.telecom.AudioState); - method public void onConferenceWith(android.telecom.Connection); method public void onDisconnect(); method public void onHold(); method public void onPlayDtmfTone(char); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 2227a04d567b8..51f193fde2831 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1009,16 +1009,6 @@ public abstract class Connection { */ public void onPostDialContinue(boolean proceed) {} - /** - * Merge this connection and the specified connection into a conference call. Once the - * connections are merged, the calls should be added to the an existing or new - * {@code Conference} instance. For new {@code Conference} instances, use - * {@code ConnectionService#addConference}. - * - * @param otherConnection The connection with which this connection should be conferenced. - */ - public void onConferenceWith(Connection otherConnection) {} - static String toLogSafePhoneNumber(String number) { // For unknown number, log empty string. if (number == null) {