Revert "IMS Conference Callback Handling"
The Android Automerger [Mon, 10 Nov 2014 01:15:04 +0000 (17:15 -0800)]
This reverts commit c6d5390b7838625b39f845b3b3c7753171935acd.

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

index 82adfc3..3ecf1b3 100644 (file)
@@ -1501,6 +1501,8 @@ public class ImsCall implements ICall {
                     }
                 }
             }
+        } else if (!mCallGroup.isReferrer(ImsCall.this)) {
+            return;
         }
 
         listener = mListener;
@@ -1675,9 +1677,6 @@ public class ImsCall implements ICall {
                 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 {
@@ -1941,8 +1940,9 @@ public class ImsCall implements ICall {
 
         @Override
         public void callSessionTerminated(ImsCallSession session, ImsReasonInfo reasonInfo) {
-            if (mSession != session) {
-                log("callSessionTerminated :: not supported for conference session=" + session);
+            if (isTransientConferenceSession(session)) {
+                log("callSessionTerminated :: not supported for transient conference session=" +
+                        session);
                 return;
             }