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

am 9e18d7ab: Merge "Remove unused onConferenceWith method" into lmp-mr1-dev

Browse Source 
* commit '9e18d7ab70eb581200afe0abbd1bb6e32f9e135d':
  Remove unused onConferenceWith method
This commit is contained in:
Jay Shrauner
2014-10-15 20:52:52 +00:00
committed by Android Git Automerger
parent 2cd596c6a2 9e18d7ab70
commit 60841fcb7b
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28114,7 +28114,6 @@ package android.telecom {
method public void onAbort(); method public void onAbort();
method public void onAnswer(); method public void onAnswer();
method public void onAudioStateChanged(android.telecom.AudioState); method public void onAudioStateChanged(android.telecom.AudioState);
method public void onConferenceWith(android.telecom.Connection);
method public void onDisconnect(); method public void onDisconnect();
method public void onHold(); method public void onHold();
method public void onPlayDtmfTone(char); method public void onPlayDtmfTone(char);

10
telecomm/java/android/telecom/Connection.java
View File

@@ -1009,16 +1009,6 @@ public abstract class Connection {
*/ */
public void onPostDialContinue(boolean proceed) {} 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) { static String toLogSafePhoneNumber(String number) {
// For unknown number, log empty string. // For unknown number, log empty string.
if (number == null) { if (number == null) {