From 50e3506533478fa273cbc92c2919470d1889f1ed Mon Sep 17 00:00:00 2001 From: Ihab Awad Date: Tue, 30 Sep 2014 09:17:03 -0700 Subject: [PATCH] Refine implementation of GSM conferences (1/3) Bug: 17684223 Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46 --- telecomm/java/android/telecom/Conference.java | 60 ++++++++++++++++++++++ telecomm/java/android/telecom/Connection.java | 4 +- .../java/android/telecom/ConnectionService.java | 28 +++++++--- .../java/android/telecom/RemoteConference.java | 20 ++++++++ .../android/telecom/RemoteConnectionService.java | 13 ++++- 5 files changed, 114 insertions(+), 11 deletions(-) diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index e47d9d160cb1..b7b98bf329f0 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -18,6 +18,7 @@ package android.telecom; import android.annotation.SystemApi; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -37,6 +38,8 @@ public abstract class Conference { public void onDisconnected(Conference conference, DisconnectCause disconnectCause) {} public void onConnectionAdded(Conference conference, Connection connection) {} public void onConnectionRemoved(Conference conference, Connection connection) {} + public void onConferenceableConnectionsChanged( + Conference conference, List conferenceableConnections) {} public void onDestroyed(Conference conference) {} public void onCapabilitiesChanged(Conference conference, int capabilities) {} } @@ -45,6 +48,9 @@ public abstract class Conference { private final List mChildConnections = new CopyOnWriteArrayList<>(); private final List mUnmodifiableChildConnections = Collections.unmodifiableList(mChildConnections); + private final List mConferenceableConnections = new ArrayList<>(); + private final List mUnmodifiableConferenceableConnections = + Collections.unmodifiableList(mConferenceableConnections); private PhoneAccountHandle mPhoneAccount; private AudioState mAudioState; @@ -53,6 +59,15 @@ public abstract class Conference { private int mCapabilities; private String mDisconnectMessage; + private final Connection.Listener mConnectionDeathListener = new Connection.Listener() { + @Override + public void onDestroyed(Connection c) { + if (mConferenceableConnections.remove(c)) { + fireOnConferenceableConnectionsChanged(); + } + } + }; + /** * Constructs a new Conference with a mandatory {@link PhoneAccountHandle} * @@ -120,6 +135,13 @@ public abstract class Conference { public void onSeparate(Connection connection) {} /** + * Invoked when the specified {@link Connection} should merged with the conference call. + * + * @param connection The {@code Connection} to merge. + */ + public void onMerge(Connection connection) {} + + /** * Invoked when the conference should be put on hold. */ public void onHold() {} @@ -238,6 +260,37 @@ public abstract class Conference { } /** + * Sets the connections with which this connection can be conferenced. + * + * @param conferenceableConnections The set of connections this connection can conference with. + */ + public final void setConferenceableConnections(List conferenceableConnections) { + clearConferenceableList(); + for (Connection c : conferenceableConnections) { + // If statement checks for duplicates in input. It makes it N^2 but we're dealing with a + // small amount of items here. + if (!mConferenceableConnections.contains(c)) { + c.addConnectionListener(mConnectionDeathListener); + mConferenceableConnections.add(c); + } + } + fireOnConferenceableConnectionsChanged(); + } + + private final void fireOnConferenceableConnectionsChanged() { + for (Listener l : mListeners) { + l.onConferenceableConnectionsChanged(this, getConferenceableConnections()); + } + } + + /** + * Returns the connections with which this connection can be conferenced. + */ + public final List getConferenceableConnections() { + return mUnmodifiableConferenceableConnections; + } + + /** * Tears down the conference object and any of its current connections. */ public final void destroy() { @@ -313,4 +366,11 @@ public abstract class Conference { } } } + + private final void clearConferenceableList() { + for (Connection c : mConferenceableConnections) { + c.removeConnectionListener(mConnectionDeathListener); + } + mConferenceableConnections.clear(); + } } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 13acc598f1b9..b5f66926d8c0 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -870,7 +870,7 @@ public abstract class Connection { } /** - * Obtains the connections with which this connection can be conferenced. + * Returns the connections with which this connection can be conferenced. */ public final List getConferenceableConnections() { return mUnmodifiableConferenceableConnections; @@ -1100,7 +1100,7 @@ public abstract class Connection { private final void fireOnConferenceableConnectionsChanged() { for (Listener l : mListeners) { - l.onConferenceableConnectionsChanged(this, mConferenceableConnections); + l.onConferenceableConnectionsChanged(this, getConferenceableConnections()); } } diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index ed9251b7afda..efd311e8ca3c 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -360,6 +360,14 @@ public abstract class ConnectionService extends Service { } @Override + public void onConferenceableConnectionsChanged( + Conference conference, List conferenceableConnections) { + mAdapter.setConferenceableConnections( + mIdByConference.get(conference), + createConnectionIdList(conferenceableConnections)); + } + + @Override public void onDestroyed(Conference conference) { removeConference(conference); } @@ -638,19 +646,25 @@ public abstract class ConnectionService extends Service { private void conference(String callId1, String callId2) { Log.d(this, "conference %s, %s", callId1, callId2); - Connection connection1 = findConnectionForAction(callId1, "conference"); - if (connection1 == getNullConnection()) { - Log.w(this, "Connection1 missing in conference request %s.", callId1); - return; - } - Connection connection2 = findConnectionForAction(callId2, "conference"); if (connection2 == getNullConnection()) { Log.w(this, "Connection2 missing in conference request %s.", callId2); return; } - onConference(connection1, connection2); + Connection connection1 = findConnectionForAction(callId1, "conference"); + if (connection1 == getNullConnection()) { + Conference conference1 = findConferenceForAction(callId1, "addConnection"); + if (conference1 == getNullConference()) { + Log.w(this, + "Connection1 or Conference1 missing in conference request %s.", + callId1); + } else { + conference1.onMerge(connection2); + } + } else { + onConference(connection1, connection2); + } } private void splitFromConference(String callId) { diff --git a/telecomm/java/android/telecom/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java index b18cb968f182..b548274de2fc 100644 --- a/telecomm/java/android/telecom/RemoteConference.java +++ b/telecomm/java/android/telecom/RemoteConference.java @@ -21,6 +21,7 @@ import com.android.internal.telecom.IConnectionService; import android.annotation.SystemApi; import android.os.RemoteException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -40,6 +41,9 @@ public final class RemoteConference { public void onConnectionAdded(RemoteConference conference, RemoteConnection connection) {} public void onConnectionRemoved(RemoteConference conference, RemoteConnection connection) {} public void onCapabilitiesChanged(RemoteConference conference, int capabilities) {} + public void onConferenceableConnectionsChanged( + RemoteConference conference, + List conferenceableConnections) {} public void onDestroyed(RemoteConference conference) {} } @@ -50,6 +54,9 @@ public final class RemoteConference { private final List mChildConnections = new CopyOnWriteArrayList<>(); private final List mUnmodifiableChildConnections = Collections.unmodifiableList(mChildConnections); + private final List mConferenceableConnections = new ArrayList<>(); + private final List mUnmodifiableConferenceableConnections = + Collections.unmodifiableList(mConferenceableConnections); private int mState = Connection.STATE_NEW; private DisconnectCause mDisconnectCause; @@ -127,6 +134,15 @@ public final class RemoteConference { } } + /** @hide */ + void setConferenceableConnections(List conferenceableConnections) { + mConferenceableConnections.clear(); + mConferenceableConnections.addAll(conferenceableConnections); + for (Callback c : mCallbacks) { + c.onConferenceableConnectionsChanged(this, mUnmodifiableConferenceableConnections); + } + } + /** {@hide} */ void setDisconnected(DisconnectCause disconnectCause) { if (mState != Connection.STATE_DISCONNECTED) { @@ -219,6 +235,10 @@ public final class RemoteConference { } } + public List getConferenceableConnections() { + return mUnmodifiableConferenceableConnections; + } + public final void registerCallback(Callback callback) { mCallbacks.add(callback); } diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index d959e50dda5f..328dc8691c53 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -278,8 +278,13 @@ final class RemoteConnectionService { } } - findConnectionForAction(callId, "setConferenceableConnections") - .setConferenceableConnections(conferenceable); + if (hasConnection(callId)) { + findConnectionForAction(callId, "setConferenceableConnections") + .setConferenceableConnections(conferenceable); + } else { + findConferenceForAction(callId, "setConferenceableConnections") + .setConferenceableConnections(conferenceable); + } } }; @@ -358,6 +363,10 @@ final class RemoteConnectionService { } } + private boolean hasConnection(String callId) { + return mConferenceById.containsKey(callId); + } + private RemoteConnection findConnectionForAction( String callId, String action) { if (mConnectionById.containsKey(callId)) { -- 2.11.0