diff --git a/api/current.txt b/api/current.txt index 5664e63f6cdcf..755393d9c7a59 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28071,12 +28071,14 @@ package android.telecom { method public final void destroy(); method public final android.telecom.AudioState getAudioState(); method public final int getCapabilities(); + method public final java.util.List getConferenceableConnections(); method public final java.util.List getConnections(); method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle(); method public final int getState(); method public void onAudioStateChanged(android.telecom.AudioState); method public void onDisconnect(); method public void onHold(); + method public void onMerge(android.telecom.Connection); method public void onMerge(); method public void onPlayDtmfTone(char); method public void onSeparate(android.telecom.Connection); @@ -28086,6 +28088,7 @@ package android.telecom { method public final void removeConnection(android.telecom.Connection); method public final void setActive(); method public final void setCapabilities(int); + method public final void setConferenceableConnections(java.util.List); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setOnHold(); } @@ -28270,6 +28273,7 @@ package android.telecom { public final class RemoteConference { method public void disconnect(); method public final int getCallCapabilities(); + method public java.util.List getConferenceableConnections(); method public final java.util.List getConnections(); method public android.telecom.DisconnectCause getDisconnectCause(); method public final int getState(); @@ -28288,6 +28292,7 @@ package android.telecom { public static abstract class RemoteConference.Callback { ctor public RemoteConference.Callback(); method public void onCapabilitiesChanged(android.telecom.RemoteConference, int); + method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List); method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection); method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection); method public void onDestroyed(android.telecom.RemoteConference);