drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev

Browse Source
This commit is contained in:
Andrew Lee
2014-11-07 01:54:00 +00:00
committed by Android (Google) Code Review
parent 3ed9f2f903 46f7f5dce4
commit a70688f2a5
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -28115,6 +28115,7 @@ package android.telecom {
method public android.telecom.Connection getPrimaryConnection();
method public final int getState();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onConnectionAdded(android.telecom.Connection);
method public void onDisconnect();
method public void onHold();
method public void onMerge(android.telecom.Connection);
@ -28153,7 +28154,6 @@ package android.telecom {
method public void onAbort();
method public void onAnswer();
method public void onAudioStateChanged(android.telecom.AudioState);
method public void onConferenceChanged();
method public void onDisconnect();
method public void onHold();
method public void onPlayDtmfTone(char);

8
telecomm/java/android/telecom/Conference.java
View File

@ -178,6 +178,13 @@ public abstract class Conference {
*/
public void onAudioStateChanged(AudioState state) {}
/**
* Notifies this conference that a connection has been added to it.
*
* @param connection The newly added connection.
*/
public void onConnectionAdded(Connection connection) {}
/**
* Sets state to be on hold.
*/
@ -238,6 +245,7 @@ public abstract class Conference {
if (connection != null && !mChildConnections.contains(connection)) {
if (connection.setConference(this)) {
mChildConnections.add(connection);
onConnectionAdded(connection);
for (Listener l : mListeners) {
l.onConnectionAdded(this, connection);
}

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

@ -921,7 +921,6 @@ public abstract class Connection {
mConference = conference;
if (mConnectionService != null && mConnectionService.containsConference(conference)) {
fireConferenceChanged();
onConferenceChanged();
}
return true;
}
@ -937,7 +936,6 @@ public abstract class Connection {
Log.d(this, "Conference reset");
mConference = null;
fireConferenceChanged();
onConferenceChanged();
}
}
@ -1030,11 +1028,6 @@ public abstract class Connection {
*/
public void onPostDialContinue(boolean proceed) {}
/**
* Notifies this Connection that the conference which is set on it has changed.
*/
public void onConferenceChanged() {}
static String toLogSafePhoneNumber(String number) {
// For unknown number, log empty string.
if (number == null) {