GitLab

* commit '14077be0':
  IMS: Dont clean merge info on host termination

When merge is initiated & user triggers hangup
we should process hangup only for the active call.
Peer session updates will automatically happen after
conference response.
Peer information should not be cleaned up from active call

Change-Id: I0213e434f30e705c2f23ac2fb0c127b015da56da
BUG=24410640

* commit 'd0fb6640':
  Transfer participants during 3 way conference

When active call fails to merge & only held call
merges into conference, pass the participants
from active to held call which is now going to
be the active conference call

Change-Id: I0f9ec11b92b48e8796daff8989f8af1f05548f37
Bug=23763005

* commit 'b4cb8cad':
  Fix typos

This code is supposed to change VoWiFi config,
but VT config was changed instead.

Bug: 23754677
Bug: 23931295
Change-Id: I3be431404a770d41eec883d4c36f80c111fd9a97

* commit '818c09d7':
  IMS: Clean peer & host during conference failure

Send terminate for both host & peer when they get
dropped by network before receiving the conference
response

Change-Id: I676a070f98857df12d208e8732cba2177c07823d
Bug=23819253

am 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev

* commit '198a2553':
  Ensure IMS is turned On or Off when synchronizing settings with ImsConfig

* commit '4f14347f':
  Fix potential NPE in ImsCall notifyConferenceStateUpdated.

Bug: 23219836
Change-Id: I0830bf6071841d2822038f737d935351a9ddebe4

NPE is possible if the state or state.mParticipants are null; added a
check for these scenarios.

Bug: 23742605
Change-Id: Ie2f7f11d1f76eb46e21a09a828287451a7a1675d

* commit '8ca52ff8':
  Add ImsManager.updateImsServiceConfig() function

This function pushes carrier config and user settings to ImsConfig.
It supposed to be called on boot up and when new
carrier config is loaded.

Bug: 19710775
Change-Id: I59ca99cda35d4ddbf28b662141d2fcbbd3b2d5f4

* commit 'e5f508cc':
  IMS : UT Service Capability

Change-Id: I0e70fb526f50c30cd44db9ffaf46e47ab48faa9e

1) Added new feature flag i.e UT service

Change-Id: I4cf0edf62dd75ce0239d37c3d7b8520c666df14b
Bug: 21850717

* commit '75f3ca3a':
  Fix unncessary IMS re-registration with network

When entire IMS stack turn off is going to follow the IMS
re-registration request for a specific service, there is an
unncessary overhead with extra signalling during the process of
re-registration. Also this delays the IMS turn off process.
Fixed by not performing a setFeatureValue operation for a service
turn off when the configuration allows for entire IMS stack to
be turned off.

Add Exception Handling To setAdvanced4GMode API

Bug: 22717994
Bug: 21800429
Change-Id: Ic5d7c54802818de5c8e241cacce62feb02629743

* commit '0e4c7c10':
  Prevent WFC Settings changes from impacting VoLTE Settings

* commit '3a99f787':
  Prevent WFC Settings changes from impacting VoLTE Settings

Bug: 22609300
Change-Id: I36fb3d1254c9168eb5978de1e39e6541d9c37df3

* commit '5e2ca172':
  Handle hangup for 4 way conference scenario

am 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

* commit '77e4256d':
  Support termination of a call while merge is in process.

am 245869b4: am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

* commit '245869b4':
  Remove volte_feature_disabled as carrier config handled it.

* commit '22444533':
  Handle hangup for 4 way conference scenario

* commit '89efc518':
  Support termination of a call while merge is in process.

* commit 'eb9a8ab4':
  Remove volte_feature_disabled as carrier config handled it.

Added mTerminationRequestPending flag to track when a framework or user
initiated call termination is pending.  When we get a
processCallTerminated from the RIL, we can use this to override the fact
we normally bury the termination during a merge.
Note: The code change in processCallTerminated looks a lot more involved
but really just involves wrapping a try/finally block around
the main work of the method and adding the finally to cleanup state.

Bug: 22184133
Change-Id: Ie007e8f294e36fbc0eb93492089fd5521ea4ff05

Bug: b/22602876
Change-Id: I8941162f6ece7ffa840401b7b55a3cd770c3b959

Pass the session only during 3-way conference scenario.
For all other cases pass it as null, so as to avoid the listenerproxy
getting over-written

Bug: 22173672
Change-Id: I10a223aaabe731a3a7d3c24da123dae660ed5bb3

* commit '102b0ede':
  Add method and perform cleanups in ImsCall.

* commit '6c0b0d0e':
  Add method and perform cleanups in ImsCall.