Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update api/current.txt" into lmp-mr1-dev

Browse Source
This commit is contained in:
Ihab Awad
2014-10-02 17:39:07 +00:00
committed by Android (Google) Code Review
parent 27cee10057 463dcae219
commit 4cb7274d16
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -28071,12 +28071,14 @@ package android.telecom {
method public final void destroy(); method public final void destroy();
method public final android.telecom.AudioState getAudioState(); method public final android.telecom.AudioState getAudioState();
method public final int getCapabilities(); method public final int getCapabilities();
method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
method public final java.util.List<android.telecom.Connection> getConnections(); method public final java.util.List<android.telecom.Connection> getConnections();
method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle(); method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
method public final int getState(); method public final int getState();
method public void onAudioStateChanged(android.telecom.AudioState); method public void onAudioStateChanged(android.telecom.AudioState);
method public void onDisconnect(); method public void onDisconnect();
method public void onHold(); method public void onHold();
method public void onMerge(android.telecom.Connection);
method public void onMerge(); method public void onMerge();
method public void onPlayDtmfTone(char); method public void onPlayDtmfTone(char);
method public void onSeparate(android.telecom.Connection); 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 removeConnection(android.telecom.Connection);
method public final void setActive(); method public final void setActive();
method public final void setCapabilities(int); method public final void setCapabilities(int);
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setOnHold(); method public final void setOnHold();
} }
@@ -28270,6 +28273,7 @@ package android.telecom {
public final class RemoteConference { public final class RemoteConference {
method public void disconnect(); method public void disconnect();
method public final int getCallCapabilities(); method public final int getCallCapabilities();
method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
method public final java.util.List<android.telecom.RemoteConnection> getConnections(); method public final java.util.List<android.telecom.RemoteConnection> getConnections();
method public android.telecom.DisconnectCause getDisconnectCause(); method public android.telecom.DisconnectCause getDisconnectCause();
method public final int getState(); method public final int getState();
@@ -28288,6 +28292,7 @@ package android.telecom {
public static abstract class RemoteConference.Callback { public static abstract class RemoteConference.Callback {
ctor public RemoteConference.Callback(); ctor public RemoteConference.Callback();
method public void onCapabilitiesChanged(android.telecom.RemoteConference, int); method public void onCapabilitiesChanged(android.telecom.RemoteConference, int);
method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);
method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection); method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection);
method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection); method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);
method public void onDestroyed(android.telecom.RemoteConference); method public void onDestroyed(android.telecom.RemoteConference);