summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authorShriram Ganesh <sganesh@codeaurora.org>2014-12-11 17:53:38 -0800
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:26:21 -0600
commitd2ecd93f472cc76ee05c80e3721ca013622145ec (patch)
tree49749929298d6c788ce2d0ffad70d4b376aa987f /telecomm/java/android
parentcee35a57a9049cf253b7523f9bfd9b2d48547871 (diff)
downloadframeworks_base-d2ecd93f472cc76ee05c80e3721ca013622145ec.zip
frameworks_base-d2ecd93f472cc76ee05c80e3721ca013622145ec.tar.gz
frameworks_base-d2ecd93f472cc76ee05c80e3721ca013622145ec.tar.bz2
Added support for mid-call enabled SRVCC conference call
When TelephonyConnection is created for an unknown connection, the recalculation of conference participants have to be retriggered. This is because, unless that TelephonyConnection is added to ConnectionService, it cannot be added as part of a conference call in CallsManager. Change-Id: Ic9359104f02eddff655d84fd25f5c28c9158e5f4
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/ConnectionService.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 96f44b9..383e45b 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -656,6 +656,9 @@ public abstract class ConnectionService extends Service {
connection.getDisconnectCause(),
createIdList(connection.getConferenceables()),
connection.getExtras()));
+ if (isUnknown) {
+ triggerConferenceRecalculate();
+ }
}
private void abort(String callId) {
@@ -1016,6 +1019,16 @@ public abstract class ConnectionService extends Service {
}
/**
+ * Trigger recalculate functinality for conference calls. This is used when a Telephony
+ * Connection is part of a conference controller but is not yet added to Connection
+ * Service and hence cannot be added to the conference call.
+ *
+ * @hide
+ */
+ public void triggerConferenceRecalculate() {
+ }
+
+ /**
* Create a {@code Connection} given an outgoing request. This is used to initiate new
* outgoing calls.
*