diff options
| author | Suchand Ghosh <suchan@codeaurora.org> | 2014-09-02 16:06:43 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:22:46 -0600 |
| commit | c6ce3ab8285eee4906f100bc2c3f3018b23e128d (patch) | |
| tree | 994f399c6139c06c16202f1f1874a1ca8afdb06d /src | |
| parent | a88082f819df4fa6c19ff3ae1a8cf63d6cf572fe (diff) | |
| download | android_frameworks_opt_net_ims-c6ce3ab8285eee4906f100bc2c3f3018b23e128d.tar.gz android_frameworks_opt_net_ims-c6ce3ab8285eee4906f100bc2c3f3018b23e128d.tar.bz2 android_frameworks_opt_net_ims-c6ce3ab8285eee4906f100bc2c3f3018b23e128d.zip | |
IMS: Conference URI support.
Add code to call correct call.start()
based on conference URI.
Change-Id: Id4ac54100919b6635f0414b929551a2dab3ef95a
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 12c6d8a..da05fad 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -42,6 +42,8 @@ import com.android.ims.internal.IImsUt; import com.android.ims.internal.ImsCallSession; import com.android.ims.internal.IImsConfig; +import com.android.internal.telephony.TelephonyProperties; + import java.util.HashMap; /** @@ -714,8 +716,9 @@ public class ImsManager { call.setListener(listener); ImsCallSession session = createCallSession(serviceId, profile); - - if ((callees != null) && (callees.length == 1)) { + boolean isConferenceUri = profile.getCallExtraBoolean( + TelephonyProperties.EXTRAS_IS_CONFERENCE_URI, false); + if (!isConferenceUri && (callees != null) && (callees.length == 1)) { call.start(session, callees[0]); } else { call.start(session, callees); |