IMS call merge call-back changes.
[android/platform/frameworks/opt/net/ims.git] / src / java / com / android / ims / ImsCall.java
index e5e0ed0..778679a 100644 (file)
@@ -1896,10 +1896,10 @@ public class ImsCall implements ICall {
         }
 
         @Override
-        public void callSessionMerged(ImsCallSession session,
+        public void callSessionMergeStarted(ImsCallSession session,
                 ImsCallSession newSession, ImsCallProfile profile) {
             if (DBG) {
-                log("callSessionMerged :: session=" + session
+                log("callSessionMergeStarted :: session=" + session
                         + ", newSession=" + newSession + ", profile=" + profile);
             }
 
@@ -1924,12 +1924,21 @@ public class ImsCall implements ICall {
                 try {
                     listener.onCallMerged(ImsCall.this, newCall);
                 } catch (Throwable t) {
-                    loge("callSessionMerged :: ", t);
+                    loge("callSessionMergeStarted :: ", t);
                 }
             }
         }
 
         @Override
+        public void callSessionMergeComplete(ImsCallSession session) {
+            if (DBG) {
+                log("callSessionMergeComplete :: session=" + session);
+            }
+
+            // TODO handle successful completion of call session merge.
+        }
+
+        @Override
         public void callSessionMergeFailed(ImsCallSession session,
                 ImsReasonInfo reasonInfo) {
             if (DBG) {