commit f5826f332f88b5c90ecca4a89ffa271698d87f93
author Etan Cohen <etancohen@google.com> Fri Aug 08 17:41:45 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Aug 26 17:15:54 2014 -0700
tree 83c998d92b959ece9b90d3dd2c23a24069b7bf7c
parent 76dc5e64b779a0e709c22d5c97950326ad505dee

Conference calling for IMS: add code to delegate from parent GSM/CDMA phone.

Bug: 17221493
Change-Id: I261922349cb0574a0b726e831bc5205bb2b37019

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
index d6be758..c3ac036 100644
--- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -337,6 +337,11 @@
 
     @Override
     public void conference() {
+        if (mImsPhone != null && mImsPhone.canConference()) {
+            log("conference() - delegated to IMS phone");
+            mImsPhone.conference();
+            return;
+        }
         // three way calls in CDMA will be handled by feature codes
         Rlog.e(LOG_TAG, "conference: not possible in CDMA");
     }
@@ -591,6 +596,9 @@
 
     @Override
     public boolean canConference() {
+        if (mImsPhone != null && mImsPhone.canConference()) {
+            return true;
+        }
         Rlog.e(LOG_TAG, "canConference: not possible in CDMA");
         return false;
     }

src/java/com/android/internal/telephony/gsm/GSMPhone.java

diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index d5aaa7c..c9d1d5e 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -523,7 +523,11 @@
 
     @Override
     public boolean canConference() {
-        return mCT.canConference();
+        boolean canImsConference = false;
+        if (mImsPhone != null) {
+            canImsConference = mImsPhone.canConference();
+        }
+        return mCT.canConference() || canImsConference;
     }
 
     public boolean canDial() {
@@ -532,6 +536,11 @@
 
     @Override
     public void conference() {
+        if (mImsPhone != null && mImsPhone.canConference()) {
+            log("conference() - delegated to IMS phone");
+            mImsPhone.conference();
+            return;
+        }
         mCT.conference();
     }