commit c6d5390b7838625b39f845b3b3c7753171935acd
author Omkar Kolangade <omkark@codeaurora.org> Wed Nov 05 13:56:57 2014 -0800
committer The Android Automerger <android-build@android.com> Sun Nov 09 09:09:40 2014 -0800
tree 84c605a69f7cb8c4a6af08e4e60fc0b99f3fae07
parent c0aadc6946ddc780e4b035c9e3974b151559661e

IMS Conference Callback Handling

Adding logic to handle intermediate
and conference callbacks while creating
a conference session as well as adding
a call to an existing conference.

Change-Id: Ib53a8f9408f807a6ce1be6005e1fc911b87598d4

src/java/com/android/ims/ImsCall.java

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 3ecf1b3..82adfc3 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1501,8 +1501,6 @@
                     }
                 }
             }
-        } else if (!mCallGroup.isReferrer(ImsCall.this)) {
-            return;
         }
 
         listener = mListener;
@@ -1677,6 +1675,9 @@
                 return;
             }
 
+            // If this condition is satisfied, this call is either a part of
+            // a conference call or a call that is about to be merged into an
+            // existing conference call.
             if (mCallGroup != null) {
                 notifyConferenceSessionTerminated(reasonInfo);
             } else {
@@ -1940,9 +1941,8 @@
 
         @Override
         public void callSessionTerminated(ImsCallSession session, ImsReasonInfo reasonInfo) {
-            if (isTransientConferenceSession(session)) {
-                log("callSessionTerminated :: not supported for transient conference session=" +
-                        session);
+            if (mSession != session) {
+                log("callSessionTerminated :: not supported for conference session=" + session);
                 return;
             }