diff options
| author | Ihab Awad <ihab@google.com> | 2014-09-30 09:17:03 -0700 |
|---|---|---|
| committer | Ihab Awad <ihab@google.com> | 2014-09-30 16:46:39 -0700 |
| commit | 50e3506533478fa273cbc92c2919470d1889f1ed (patch) | |
| tree | 2427095ce136a68b7ee48827bd9bac8bed934dcd /telecomm/java/android/telecom/RemoteConnectionService.java | |
| parent | 9cf01b63cb0023aec0e05b1ce050ff572532b876 (diff) | |
| download | frameworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.zip frameworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.tar.gz frameworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.tar.bz2 | |
Refine implementation of GSM conferences (1/3)
Bug: 17684223
Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index d959e50..328dc86 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)) { |