3 years agoReturn true if user can't edit Enhanced 4G LTE Mode
Sungmin Choi [Mon, 1 Feb 2016 08:15:35 +0000]
Return true if user can't edit Enhanced 4G LTE Mode

If user can't edit Enhanced 4G LTE Mode, it assumes Enhanced 4G LTE Mode
is always true. If user changes SIM from editable mode to uneditable mode,
need to return true.

For example,
User with SKT/KT SIM (or other carrier) can set Enhanced 4G LTE Mode to off.
And then, user changes SIM from SKT/KT to LGU.
User with LGU SIM can't change Enhanced 4G LTE Mode to on from off.
Because LGU SIM has uneditable Enhanced 4G LTE Mode config.
User can't call in this case.

Change-Id: I0ea1e55fa0708218982b2b738d49310343682896

3 years agoMerge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wirel...
Pavel Zhamaitsiak [Thu, 25 Feb 2016 19:47:04 +0000]
Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev
am: 66ad4157f5

* commit '66ad4157f59141b396e7ffbad2f2f2b4b95e44ef':
  Add registrationAssociatedUriChanged to ImsRegistrationListener

3 years agoMerge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wirel...
Pavel Zhamaitsiak [Thu, 25 Feb 2016 19:43:31 +0000]
Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev

3 years agoIMS RAT Reporting in Registration Callbacks
Omkar Kolangade [Fri, 12 Feb 2016 03:46:11 +0000]
IMS RAT Reporting in Registration Callbacks
am: a7ced64be6

* commit 'a7ced64be6f5c8e0e1c9e2a9a0a51c7eb324ca4d':
  IMS RAT Reporting in Registration Callbacks

3 years agoAdd registrationAssociatedUriChanged to ImsRegistrationListener
Pavel Zhamaitsiak [Fri, 12 Feb 2016 01:21:05 +0000]
Add registrationAssociatedUriChanged to ImsRegistrationListener

Update ImsManager to reflect changes in AIDL

Bug: 24613146
Change-Id: I91847b7051af49dfb8cec726daea18957a9acea1

3 years agoIMS RAT Reporting in Registration Callbacks
Omkar Kolangade [Tue, 5 May 2015 00:55:13 +0000]
IMS RAT Reporting in Registration Callbacks

Modifying the registrationProgressing and
registrationConnected callbacks to have a parameter
for IMS Radio Access Technology information.
Through this, frameworks is aware of the IMS
RAT - LTE or WiFi - and can use the information
to display appropriate UI notifications.

Bug: 21902225
Change-Id: I18af9c146be06d98f9ea9cd9c947e4cffee04a42

3 years agoIMS: Video Quality Constants (VT)
Omkar Kolangade [Fri, 5 Feb 2016 22:17:53 +0000]
IMS: Video Quality Constants (VT)
am: 255dca28a4

* commit '255dca28a46aa31b70b64244f8beb1c9a965e7e1':
  IMS: Video Quality Constants (VT)

3 years agoIMS: Video Quality Constants (VT)
Omkar Kolangade [Fri, 29 Jan 2016 00:59:54 +0000]
IMS: Video Quality Constants (VT)

Adding video quality constants. Also removing
unused video quality APIs from ImsConfig.

Change-Id: Ief2583c8d4a0e8167bbb4916ebab8f16f5002d3f

3 years agoMerge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev
Pavel Zhamaitsiak [Thu, 28 Jan 2016 23:47:55 +0000]
Merge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev
am: 9df7c39174

* commit '9df7c391748b141c957222ab41e955fbd21633fb':
  ImsManager: Allow to set ImsConfigListener

3 years agoMerge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev
Pavel Zhamaitsiak [Thu, 28 Jan 2016 23:42:27 +0000]
Merge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev

3 years agoMerge "IMS: Update host call callProfile on conference success" into mm-wireless-dev
Tyler Gunn [Tue, 26 Jan 2016 23:02:57 +0000]
Merge "IMS: Update host call callProfile on conference success" into mm-wireless-dev
am: e1f8fa7b50

* commit 'e1f8fa7b50f881d457431a0965579b1259b95b91':
  IMS: Update host call callProfile on conference success

3 years agoImsManager: Allow to set ImsConfigListener
Pavel Zhamaitsiak [Tue, 26 Jan 2016 22:34:09 +0000]
ImsManager: Allow to set ImsConfigListener

The listener can be used to get notifications when feature values are changed.

Change-Id: Idabdc12fa0737957abda1410adef40a6bf29c600

3 years agoMerge "IMS: Update host call callProfile on conference success" into mm-wireless-dev
Tyler Gunn [Tue, 26 Jan 2016 22:51:48 +0000]
Merge "IMS: Update host call callProfile on conference success" into mm-wireless-dev

3 years agoIMS: Notify conference participants state changed even when list is empty
Anju Mathapati [Mon, 25 Jan 2016 22:30:12 +0000]
IMS: Notify conference participants state changed even when list is empty
am: 0f108033df

* commit '0f108033df343d446e42c403494cc2ab079895d5':
  IMS: Notify conference participants state changed even when list is empty

3 years agoIMS: Update host call callProfile on conference success
Anju Mathapati [Tue, 17 Nov 2015 13:29:24 +0000]
IMS: Update host call callProfile on conference success

Update host call callProfile on conference success

Change-Id: I58ffb8214aef030bdc17b19e1112d4954e323e25
BUG=26772683

3 years agoIMS: Notify conference participants state changed even when list is empty
Anju Mathapati [Fri, 9 Oct 2015 22:34:28 +0000]
IMS: Notify conference participants state changed even when list is empty

- We are not notifying conference participant state changed when there
  is no participant in the conference participants list. We should
  notify state changed in this case.

Change-Id: I1586bd01f6d693a3ee7f53b9411e8b3945979948
BUG=26754447

3 years agoAdded dump support to more telephony components.
Jack Yu [Wed, 30 Dec 2015 21:34:19 +0000]
Added dump support to more telephony components.
am: 2f102bd7c0

* commit '2f102bd7c09024d68a12594882d0f9313149dd1a':
  Added dump support to more telephony components.

3 years agoAdded dump support to more telephony components.
Jack Yu [Mon, 28 Dec 2015 23:31:48 +0000]
Added dump support to more telephony components.

Added dump support to Ims components and also improved service
state tracker dump support.

bug: 25955373
Change-Id: I25578d251382eeba22c59925be4d878c7bd7b469

3 years agoUse "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
Alex Cheung [Wed, 23 Dec 2015 22:50:39 +0000]
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276

3 years agoMerge "Update ImsManager to use CarrierConfigManager"
Pavel Zhamaitsiak [Wed, 23 Dec 2015 00:52:42 +0000]
Merge "Update ImsManager to use CarrierConfigManager"

3 years agoUpdate ImsManager to use CarrierConfigManager
Pavel Zhamaitsiak [Wed, 23 Dec 2015 00:51:57 +0000]
Update ImsManager to use CarrierConfigManager

This code was not updated in branch it came from.

Change-Id: I1e9d41f0ead15c9fea8c839ff36a6bb567bf67ed

3 years agoTurn on IMS if it is not allowed to turn it off for current carrier
Pavel Zhamaitsiak [Tue, 22 Dec 2015 18:23:49 +0000]
Turn on IMS if it is not allowed to turn it off for current carrier
am: 9510b1cb97

* commit '9510b1cb97fd77cb6a595b91405cbf0a8a4c426e':
  Turn on IMS if it is not allowed to turn it off for current carrier

3 years agoTurn on IMS if it is not allowed to turn it off for current carrier
Pavel Zhamaitsiak [Fri, 18 Dec 2015 19:30:49 +0000]
Turn on IMS if it is not allowed to turn it off for current carrier

We might turn off IMS when Carrier Config allows it. When phone switches
to Carrier Config for which it is expected that IMS stays On, then we need
to explicitly turn it on.

Bug: 25703525
Change-Id: I39ed8d976684e7e23560f8c6ac1119bb8498a62b

3 years agoMerge commit '16516864151ba277ca16e708fa3fe61f6d5384c9' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:52:40 +0000]
Merge commit '16516864151ba277ca16e708fa3fe61f6d5384c9' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

3 years agoMerge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:52:06 +0000]
Merge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Change-Id: I3a24f26df9ae1813f3ffc05501ae78e794ec814e

3 years agoMerge commit 'df393e9776b983c51c97c1343032bfa9d20f39a3' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:50:03 +0000]
Merge commit 'df393e9776b983c51c97c1343032bfa9d20f39a3' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

3 years agoMerge commit '3801547b13b58a5fae868652ed04eacd1940cd81' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:47:03 +0000]
Merge commit '3801547b13b58a5fae868652ed04eacd1940cd81' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

3 years agoAdd factoryReset() function to ImsManager
Pavel Zhamaitsiak [Tue, 10 Nov 2015 22:36:44 +0000]
Add factoryReset() function to ImsManager

- Reset Enhanbed 4G LTE Mode setting
- Reset WFC settings
- Reset VT setting

Bug: 25300757
Change-Id: I747f6d90e513f8b2243289e420be4faca86a0312

3 years agoAdd factoryReset() function to ImsManager
Pavel Zhamaitsiak [Mon, 7 Dec 2015 23:04:53 +0000]
Add factoryReset() function to ImsManager
am: 8c065f5f1b

* commit '8c065f5f1bc66bec1c12cdd156b90f1cb0e98df8':
  Add factoryReset() function to ImsManager

3 years agoAdd Exception Handling To setAdvanced4GMode API
Omkar Kolangade [Fri, 24 Oct 2014 18:10:52 +0000]
Add Exception Handling To setAdvanced4GMode API

Added a try-catch block to handle ImsException.

Bug: 21800429
Change-Id: I335e2db69348cd617100b65184ee1b970e7bc11c

3 years agoAdded API to configure VT over IMS.
Etan Cohen [Tue, 5 May 2015 01:02:09 +0000]
Added API to configure VT over IMS.

Bug: 20750301
Change-Id: Iecad593e8f7aa5a76a37ff63e9ff9b9536827a5c

3 years agoAdd factoryReset() function to ImsManager
Pavel Zhamaitsiak [Tue, 10 Nov 2015 22:36:44 +0000]
Add factoryReset() function to ImsManager

- Reset Enhanbed 4G LTE Mode setting
- Reset WFC settings
- Reset VT setting

Bug: 25300757
Change-Id: I747f6d90e513f8b2243289e420be4faca86a0312

3 years agoIMS: Add check for GBA SIM
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:41:26 +0000]
IMS: Add check for GBA SIM
am: 57911d120a

* commit '57911d120a57beb906c00cfddbdae38249b205e7':
  IMS: Add check for GBA SIM

3 years agoIMS: Add check for GBA SIM
Pavel Zhamaitsiak [Wed, 21 Oct 2015 00:31:31 +0000]
IMS: Add check for GBA SIM
am: 57911d120a

* commit '57911d120a57beb906c00cfddbdae38249b205e7':
  IMS: Add check for GBA SIM

3 years agoIMS: Add check for GBA SIM
Pavel Zhamaitsiak [Tue, 20 Oct 2015 21:26:34 +0000]
IMS: Add check for GBA SIM

Bug: 23731243
Change-Id: Iff8d9696a672f44b28adbfe2a7a147133247f815

3 years agoam 14077be0: IMS: Dont clean merge info on host termination
Anju Mathapati [Mon, 12 Oct 2015 17:12:25 +0000]
am 14077be0: IMS: Dont clean merge info on host termination

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

3 years agoam 14077be0: IMS: Dont clean merge info on host termination
Anju Mathapati [Sun, 11 Oct 2015 17:19:53 +0000]
am 14077be0: IMS: Dont clean merge info on host termination

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

3 years agoIMS: Dont clean merge info on host termination
Anju Mathapati [Fri, 25 Sep 2015 21:49:38 +0000]
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

3 years agoam d0fb6640: Transfer participants during 3 way conference
Anju Mathapati [Mon, 14 Sep 2015 15:30:16 +0000]
am d0fb6640: Transfer participants during 3 way conference

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

3 years agoam d0fb6640: Transfer participants during 3 way conference
Anju Mathapati [Mon, 14 Sep 2015 15:11:46 +0000]
am d0fb6640: Transfer participants during 3 way conference

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

3 years agoTransfer participants during 3 way conference
Anju Mathapati [Wed, 22 Jul 2015 20:55:57 +0000]
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

3 years agoam b4cb8cad: Merge "Fix typos" into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 11 Sep 2015 19:51:46 +0000]
am b4cb8cad: Merge "Fix typos" into mnc-dr-dev

* commit 'b4cb8cad7ae78f5fa384dbd19e8bb350ee315914':
  Fix typos

3 years agoam b4cb8cad: Merge "Fix typos" into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 11 Sep 2015 19:26:48 +0000]
am b4cb8cad: Merge "Fix typos" into mnc-dr-dev

* commit 'b4cb8cad7ae78f5fa384dbd19e8bb350ee315914':
  Fix typos

3 years agoMerge "Fix typos" into mnc-dr-dev
Pavel Zhamaitsiak [Fri, 11 Sep 2015 19:17:59 +0000]
Merge "Fix typos" into mnc-dr-dev

3 years agoFix typos
Pavel Zhamaitsiak [Fri, 11 Sep 2015 17:29:30 +0000]
Fix typos

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

Bug: 23754677
Bug: 23931295
Change-Id: I3be431404a770d41eec883d4c36f80c111fd9a97

3 years agoam 818c09d7: IMS: Clean peer & host during conference failure
Anju Mathapati [Fri, 11 Sep 2015 05:04:48 +0000]
am 818c09d7: IMS: Clean peer & host during conference failure

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

3 years agoam 818c09d7: IMS: Clean peer & host during conference failure
Anju Mathapati [Fri, 11 Sep 2015 03:49:34 +0000]
am 818c09d7: IMS: Clean peer & host during conference failure

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

3 years agoIMS: Clean peer & host during conference failure
Anju Mathapati [Mon, 31 Aug 2015 21:30:47 +0000]
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

3 years agoam 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with...
Pavel Zhamaitsiak [Wed, 9 Sep 2015 17:39:38 +0000]
am 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev

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

3 years agoam 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with...
Pavel Zhamaitsiak [Wed, 9 Sep 2015 17:18:39 +0000]
am 198a2553: Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev

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

3 years agoMerge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig...
Pavel Zhamaitsiak [Wed, 9 Sep 2015 17:11:32 +0000]
Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev

3 years agoam 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into...
Tyler Gunn [Wed, 9 Sep 2015 17:06:44 +0000]
am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

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

3 years agoam 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into...
Tyler Gunn [Wed, 9 Sep 2015 16:27:28 +0000]
am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

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

3 years agoMerge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
Tyler Gunn [Wed, 9 Sep 2015 16:14:57 +0000]
Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

3 years agoEnsure IMS is turned On or Off when synchronizing settings with ImsConfig
Pavel Zhamaitsiak [Wed, 9 Sep 2015 00:12:06 +0000]
Ensure IMS is turned On or Off when synchronizing settings with ImsConfig

Bug: 23219836
Change-Id: I0830bf6071841d2822038f737d935351a9ddebe4

3 years agoFix potential NPE in ImsCall notifyConferenceStateUpdated.
Tyler Gunn [Tue, 8 Sep 2015 20:10:14 +0000]
Fix potential NPE in ImsCall notifyConferenceStateUpdated.

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

Bug: 23742605
Change-Id: Ie2f7f11d1f76eb46e21a09a828287451a7a1675d

3 years agoam 8ca52ff8: Add ImsManager.updateImsServiceConfig() function
Pavel Zhamaitsiak [Sun, 6 Sep 2015 23:10:25 +0000]
am 8ca52ff8: Add ImsManager.updateImsServiceConfig() function

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

3 years agoam 8ca52ff8: Add ImsManager.updateImsServiceConfig() function
Pavel Zhamaitsiak [Sat, 5 Sep 2015 14:59:44 +0000]
am 8ca52ff8: Add ImsManager.updateImsServiceConfig() function

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

3 years agoAdd ImsManager.updateImsServiceConfig() function
Pavel Zhamaitsiak [Sat, 5 Sep 2015 00:08:35 +0000]
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

3 years agoam e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev
Anthony Lee [Fri, 7 Aug 2015 19:14:23 +0000]
am e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev

* commit 'e5f508cc81f3b5d913f64bff615f72ddab5a7c6a':
  IMS : UT Service Capability

3 years agoam e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev
Anthony Lee [Fri, 7 Aug 2015 17:55:53 +0000]
am e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev

* commit 'e5f508cc81f3b5d913f64bff615f72ddab5a7c6a':
  IMS : UT Service Capability

3 years agoMerge "IMS : UT Service Capability" into mnc-dr-dev
Anthony Lee [Fri, 7 Aug 2015 17:48:14 +0000]
Merge "IMS : UT Service Capability" into mnc-dr-dev

3 years agoresolved conflicts for merge of 47b08cf5 to mnc-vt-dev
Pavel Zhamaitsiak [Thu, 6 Aug 2015 23:49:00 +0000]
resolved conflicts for merge of 47b08cf5 to mnc-vt-dev

Change-Id: I0e70fb526f50c30cd44db9ffaf46e47ab48faa9e

3 years agoIMS : UT Service Capability
Anju Mathapati [Mon, 10 Nov 2014 12:46:13 +0000]
IMS : UT Service Capability

1) Added new feature flag i.e UT service

Change-Id: I4cf0edf62dd75ce0239d37c3d7b8520c666df14b
Bug: 21850717

3 years agoam 47b08cf5: am 75f3ca3a: Fix unncessary IMS re-registration with network
Omkar Kolangade [Thu, 6 Aug 2015 02:56:57 +0000]
am 47b08cf5: am 75f3ca3a: Fix unncessary IMS re-registration with network

* commit '47b08cf53506535d702cfb1971d375db5dcf39e3':
  Fix unncessary IMS re-registration with network

3 years agoam 75f3ca3a: Fix unncessary IMS re-registration with network
Omkar Kolangade [Thu, 6 Aug 2015 01:42:57 +0000]
am 75f3ca3a: Fix unncessary IMS re-registration with network

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

3 years agoFix unncessary IMS re-registration with network
Omkar Kolangade [Fri, 24 Oct 2014 18:10:52 +0000]
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

3 years agoam 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings
Nathan Harold [Wed, 29 Jul 2015 01:27:03 +0000]
am 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

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

3 years agoam 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings
Nathan Harold [Tue, 28 Jul 2015 18:48:23 +0000]
am 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

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

3 years agoam 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings
Nathan Harold [Tue, 28 Jul 2015 05:17:05 +0000]
am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

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

3 years agoPrevent WFC Settings changes from impacting VoLTE Settings
Nathan Harold [Fri, 24 Jul 2015 22:02:34 +0000]
Prevent WFC Settings changes from impacting VoLTE Settings

Bug: 22609300
Change-Id: I36fb3d1254c9168eb5978de1e39e6541d9c37df3

3 years agoam 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into...
Anthony Lee [Fri, 24 Jul 2015 05:09:27 +0000]
am 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

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

3 years agoam 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in...
Tyler Gunn [Fri, 24 Jul 2015 05:09:25 +0000]
am 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

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

3 years agoam 245869b4: am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config...
Junda Liu [Fri, 24 Jul 2015 05:09:22 +0000]
am 245869b4: am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

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

3 years agoam 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into...
Anthony Lee [Fri, 24 Jul 2015 03:04:53 +0000]
am 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

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

3 years agoam 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in...
Tyler Gunn [Fri, 24 Jul 2015 03:04:52 +0000]
am 77e4256d: am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

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

3 years agoam 245869b4: am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config...
Junda Liu [Fri, 24 Jul 2015 03:04:51 +0000]
am 245869b4: am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

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

3 years agoam 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev
Anthony Lee [Thu, 23 Jul 2015 19:33:17 +0000]
am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

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

3 years agoMerge "Handle hangup for 4 way conference scenario" into mnc-dev
Anthony Lee [Thu, 23 Jul 2015 19:18:17 +0000]
Merge "Handle hangup for 4 way conference scenario" into mnc-dev

3 years agoam 89efc518: Merge "Support termination of a call while merge is in process." into...
Tyler Gunn [Thu, 23 Jul 2015 19:17:38 +0000]
am 89efc518: Merge "Support termination of a call while merge is in process." into mnc-dev

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

3 years agoam eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it."...
Junda Liu [Thu, 23 Jul 2015 19:17:37 +0000]
am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

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

3 years agoMerge "Support termination of a call while merge is in process." into mnc-dev
Tyler Gunn [Thu, 23 Jul 2015 17:49:26 +0000]
Merge "Support termination of a call while merge is in process." into mnc-dev

3 years agoSupport termination of a call while merge is in process.
Tyler Gunn [Thu, 23 Jul 2015 16:28:58 +0000]
Support termination of a call while merge is in process.

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

3 years agoMerge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
Junda Liu [Thu, 23 Jul 2015 16:20:37 +0000]
Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

3 years agoRemove volte_feature_disabled as carrier config handled it.
Junda Liu [Wed, 22 Jul 2015 19:23:46 +0000]
Remove volte_feature_disabled as carrier config handled it.

Bug: b/22602876
Change-Id: I8941162f6ece7ffa840401b7b55a3cd770c3b959

3 years agoHandle hangup for 4 way conference scenario
Anju Mathapati [Fri, 17 Jul 2015 21:54:10 +0000]
Handle hangup for 4 way conference scenario

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

3 years agoam 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.
Tyler Gunn [Wed, 15 Jul 2015 23:53:47 +0000]
am 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.

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

3 years agoam 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.
Tyler Gunn [Wed, 15 Jul 2015 22:56:39 +0000]
am 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.

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

3 years agoam 6c0b0d0e: Add method and perform cleanups in ImsCall.
Tyler Gunn [Wed, 15 Jul 2015 22:44:48 +0000]
am 6c0b0d0e: Add method and perform cleanups in ImsCall.

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

3 years agoAdd method and perform cleanups in ImsCall.
Tyler Gunn [Wed, 1 Jul 2015 23:39:43 +0000]
Add method and perform cleanups in ImsCall.

- Added a couple null-checks for accesses to mConferenceParticipants.
This issue was introduced in b/21376607; I noticed some NPE logspam related
to it.
- Added a new isPendingHold() method which can be used to tell if a call
is pending a hold (used in ImsPhoneConnection later).

Bug: 22173672
Change-Id: I4399e266743955facabc9de010b08764c73ca15f

3 years agoam 394bd1e6: Add config items for Korea market
Shriram Ganesh [Fri, 10 Jul 2015 21:11:58 +0000]
am 394bd1e6: Add config items for Korea market

* commit '394bd1e6bd4392bad9973ffcd808c4b4de2b61ba':
  Add config items for Korea market

3 years agoam 394bd1e6: Add config items for Korea market
Shriram Ganesh [Fri, 10 Jul 2015 20:18:45 +0000]
am 394bd1e6: Add config items for Korea market

* commit '394bd1e6bd4392bad9973ffcd808c4b4de2b61ba':
  Add config items for Korea market

3 years agoAdd config items for Korea market
Shriram Ganesh [Tue, 23 Jun 2015 21:06:45 +0000]
Add config items for Korea market

Bug: 22170629
Change-Id: I7d923a3180e0ca1b0eae7f8c34bb4d9765949847

3 years agoam b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.
Etan Cohen [Wed, 8 Jul 2015 21:45:21 +0000]
am b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'b2770866aac802be13a3f6e7fdd61e2c1c0d2dc4':
  Remove permission check from client-side code - ineffective.

3 years agoam b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.
Etan Cohen [Wed, 8 Jul 2015 13:10:28 +0000]
am b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'b2770866aac802be13a3f6e7fdd61e2c1c0d2dc4':
  Remove permission check from client-side code - ineffective.

3 years agoam e0b0ddeb: Remove permission check from client-side code - ineffective.
Etan Cohen [Wed, 8 Jul 2015 04:18:53 +0000]
am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'e0b0ddebe63d31ea31d48d4d647778b9035b18f0':
  Remove permission check from client-side code - ineffective.

3 years agoam 4c68267e: Merge changes from topic \'merge-dr1-063015\' into mnc-dr-dev
Etan Cohen [Tue, 7 Jul 2015 22:17:06 +0000]
am 4c68267e: Merge changes from topic \'merge-dr1-063015\' into mnc-dr-dev

* commit '4c68267e68b41dd7a4af7757b412d0a5faff94da':
  Stub base class implementation for some IMS interfaces
  IMS: Add an extra for ims phantom MO call.
  MWI,phantom call,Suppl services

3 years agoRemove permission check from client-side code - ineffective.
Etan Cohen [Wed, 1 Jul 2015 18:40:08 +0000]
Remove permission check from client-side code - ineffective.

Will be added to server side code.

Bug: 17361897
Change-Id: I417a050135ead6023f996a8ea84495e1e9355a97

3 years agoam 4c68267e: Merge changes from topic \'merge-dr1-063015\' into mnc-dr-dev
Etan Cohen [Tue, 7 Jul 2015 00:33:27 +0000]
am 4c68267e: Merge changes from topic \'merge-dr1-063015\' into mnc-dr-dev

* commit '4c68267e68b41dd7a4af7757b412d0a5faff94da':
  Stub base class implementation for some IMS interfaces
  IMS: Add an extra for ims phantom MO call.
  MWI,phantom call,Suppl services

3 years agoam 2acea6f9: Check for null config from CarrierConfigManager.
Jonathan Basseri [Tue, 7 Jul 2015 00:31:21 +0000]
am 2acea6f9: Check for null config from CarrierConfigManager.

* commit '2acea6f98afe057fa1a3faf744b240563cdf6ee2':
  Check for null config from CarrierConfigManager.