commit 4f8dc822102a8b138d980cabff35ad3ac28ebb96
author Shriram Ganesh <sganesh@codeaurora.org> Tue Mar 22 16:38:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 22 16:38:30 2016 +0000
tree f16dc2974b8e225807dc5bf22fad0e67fa08e891
parent 2d47e02e2fc85b04ab790f468e662c40a1acf173
parent 1d3879b00a5135802abaf9187d99577745d41c49

Merge "Fix merge after a conference call goes through SRVCC." into mm-wireless-dev
am: 1d3879b

* commit '1d3879b00a5135802abaf9187d99577745d41c49':
  Fix merge after a conference call goes through SRVCC.

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 612ee52..857ba27 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -786,6 +786,8 @@
 
             if (mConferenceHost.getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
                 GsmConnection c = new GsmConnection(originalConnection, getTelecomCallId());
+                // This is a newly created conference connection as a result of SRVCC
+                c.setConferenceSupported(true);
                 c.updateState();
                 // Copy the connect time from the conferenceHost
                 c.setConnectTimeMillis(mConferenceHost.getConnectTimeMillis());