commit 60ccd779d1448675ad42caa537348c2bcae186c2
author Ihab Awad <ihab@google.com> Tue Sep 30 09:19:33 2014 -0700
committer Ihab Awad <ihab@google.com> Tue Sep 30 10:55:52 2014 -0700
tree 48b0a7cf8c8a1d2a4c963f59b3c611ed7a11952b
parent e471c51b7d758ed8973a1b121e181bd4adb50c61

Refine implementation of GSM conferences (2/3)

Bug: 17684223

Change-Id: I7a274de891b7efc2a781a16ce7596bf5cd3ea6ff

src/com/android/server/telecom/ConnectionServiceWrapper.java

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index ce93177..cacdc81 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -551,7 +551,7 @@
         public void setConferenceableConnections(
                 String callId, List<String> conferenceableCallIds) {
             logIncoming("setConferenceableConnections %s %s", callId, conferenceableCallIds);
-            if (mCallIdMapper.isValidCallId(callId)) {
+            if (mCallIdMapper.isValidCallId(callId) || mCallIdMapper.isValidConferenceId(callId)) {
                 SomeArgs args = SomeArgs.obtain();
                 args.arg1 = callId;
                 args.arg2 = conferenceableCallIds;