History log of /frameworks/opt/net/ims/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
52bd8d38d4370f2bdc5a963c0741468d82ccb89b 03-May-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
25a0b43d56dcd00711e41d06427eed2bc0ed3764 02-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Move rcs from frameworks/opt/net/ims to external/ims

Bug: 27811089
Change-Id: Ie7f356121e97eaeef1b3951f3c8a3c9115f97eaa
cs/Android.mk
cs/presencepolling/Android.mk
cs/presencepolling/AndroidManifest.xml
cs/presencepolling/res/values/config.xml
cs/presencepolling/res/values/strings.xml
cs/presencepolling/src/com/android/service/ims/presence/AccountUtil.java
cs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java
cs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
cs/presencepolling/src/com/android/service/ims/presence/ContactDbUtil.java
cs/presencepolling/src/com/android/service/ims/presence/Contacts.java
cs/presencepolling/src/com/android/service/ims/presence/DatabaseContentProvider.java
cs/presencepolling/src/com/android/service/ims/presence/DeviceBoot.java
cs/presencepolling/src/com/android/service/ims/presence/DeviceShutdown.java
cs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
cs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java
cs/presencepolling/src/com/android/service/ims/presence/EABProvider.java
cs/presencepolling/src/com/android/service/ims/presence/EABService.java
cs/presencepolling/src/com/android/service/ims/presence/InvalidDBException.java
cs/presencepolling/src/com/android/service/ims/presence/LauncherUtils.java
cs/presencepolling/src/com/android/service/ims/presence/PersistService.java
cs/presencepolling/src/com/android/service/ims/presence/PollingAction.java
cs/presencepolling/src/com/android/service/ims/presence/PollingService.java
cs/presencepolling/src/com/android/service/ims/presence/PollingTask.java
cs/presencepolling/src/com/android/service/ims/presence/PollingsQueue.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceBroadcastReceiver.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceContact.java
cs/presencepolling/src/com/android/service/ims/presence/PresencePreferences.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java
cs/presencepolling/src/com/android/service/ims/presence/SharedPrefUtil.java
cs/rcsmanager/Android.mk
cs/rcsmanager/AndroidManifest.xml
cs/rcsmanager/CleanSpec.mk
cs/rcsmanager/com.android.ims.rcsmanager.xml
cs/rcsmanager/src/java/com/android/ims/IRcsPresenceListener.aidl
cs/rcsmanager/src/java/com/android/ims/RcsException.java
cs/rcsmanager/src/java/com/android/ims/RcsManager.java
cs/rcsmanager/src/java/com/android/ims/RcsPresence.java
cs/rcsmanager/src/java/com/android/ims/RcsPresenceInfo.aidl
cs/rcsmanager/src/java/com/android/ims/RcsPresenceInfo.java
cs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java
cs/rcsmanager/src/java/com/android/ims/internal/EABContract.java
cs/rcsmanager/src/java/com/android/ims/internal/IRcsPresence.aidl
cs/rcsmanager/src/java/com/android/ims/internal/IRcsService.aidl
cs/rcsmanager/src/java/com/android/ims/internal/Logger.java
cs/rcsservice/Android.mk
cs/rcsservice/AndroidManifest.xml
cs/rcsservice/res/values/config.xml
cs/rcsservice/res/values/strings.xml
cs/rcsservice/src/com/android/service/ims/DeviceShutdown.java
cs/rcsservice/src/com/android/service/ims/LauncherUtils.java
cs/rcsservice/src/com/android/service/ims/RcsService.java
cs/rcsservice/src/com/android/service/ims/RcsServiceApp.java
cs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
cs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
cs/rcsservice/src/com/android/service/ims/RcsUtils.java
cs/rcsservice/src/com/android/service/ims/Task.java
cs/rcsservice/src/com/android/service/ims/TaskManager.java
cs/rcsservice/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java
cs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
cs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java
cs/rcsservice/src/com/android/service/ims/presence/StackListener.java
3c3f11580e43c90da9bbc320aa40fc9173bf687e 17-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
26915f571175c8d84db6d1f2fdf54b5cb3f6926e 15-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Wiring up Ims framework multi-endpoint APIs." into nyc-dev
ff29b9d0019018b726d1b35b30bce8e4a9984cd2 15-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Turn on VT when turning on Enhanced 4G LTE and VT is enabled in settings

Bug: 27974555
Change-Id: I6899f46e9a6d0dd5160882cdeda92ab202f8ea3a
rc/java/com/android/ims/ImsManager.java
66cafabff55c7b3d1d55037b5f92e13d512a0b58 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> RcsService: Request ImsManager's instance with correct phoneId and serviceClass

Bug: 28154548
Change-Id: I74fe051088b04ccf1aa15b277c6890cb8e1a0966
cs/rcsservice/src/com/android/service/ims/RcsService.java
rc/java/com/android/ims/ImsServiceClass.java
78f75585b002507089d2bdb242b063a09477270f 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> RcsService: Request ImsManager's instance with correct phoneId and serviceClass

Bug: 28154548
Change-Id: I74fe051088b04ccf1aa15b277c6890cb8e1a0966
cs/rcsservice/src/com/android/service/ims/RcsService.java
rc/java/com/android/ims/ImsServiceClass.java
4d128b6db8288af77d095d6239d6332e05469f35 14-Apr-2016 Tyler Gunn <tgunn@google.com> Wiring up Ims framework multi-endpoint APIs.

Completing wireup of the Ims framework multi-endpoint APIs so that we can
hook into the telephony code.

Note: I followed how the ImsEcbm API was handled, which seemed pretty
similar to the multi-endpoint APIs.

Bug: 27458894
Change-Id: I21c6fc95947692a3cf4541ddb7510e1da702ec84
rc/java/com/android/ims/ImsExternalCallStateListener.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/ImsMultiEndpoint.java
76838cd844bd5bd461742e7a0b3aa5f230e02388 12-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
f0d0f42092ffa90d520c13cf438620d57fbe1af2 11-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
6977a2748ad0952e3a12626fe47ecb3612c711d9 11-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
5a70bc97de5aff0694e47d40a4ea7a6639cecb5e 11-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
a4bfe09dceb7a8c6354eaebbfb09930156a52693 10-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
0f6e32e21862df23bb171f9e47358bcbfd9f0ae0 07-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Support VoWifi for rcs." into nyc-dev
4e99c175b9fe5439abe1bf721bd9fb37ad8ac35b 05-Apr-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
94c7be93bb628a3d8ee6fe1ca18cebb918d4937e 22-Mar-2016 Gao Bing <w20090@motorola.com> Support VoWifi for rcs.

Need handle it different since the capability could be changed along
with the wifi signal strength.

Bug: 23222011
Change-Id: I68d412798f6a3c9d9b087508ff12405ac3de4b30
cs/rcsservice/src/com/android/service/ims/RcsService.java
cs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
cs/rcsservice/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java
cs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
rc/java/com/android/ims/ImsConfig.java
92b54b27606866d7bd1c546f5dd59e7d64265fb2 02-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Cleanup VoLte and ViLte settings in ImsManager

- Remove SharedPref which was previously used for VT setting.
- Don't set ViLte feature value in setAdvanced4GMode.

Bug: 27974555
Change-Id: Id610502c979cac4d47f58efbadc39bb812d3ed47
rc/java/com/android/ims/ImsManager.java
d094e1be21bc5f46805f5c60ef0b05cbd3a6ca22 31-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
47aeacf0b9b7412b70e8cab8e81f358efd032f2a 31-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Call ImsConfig.setProvisionedValue() in new thread

Bug: 27816215
Change-Id: I2af44c0b9f3db7ba586bbeb549ed1455b4af86a4
rc/java/com/android/ims/ImsManager.java
3228a1dca5b72b27c1040e995f2baa6ee7b63526 30-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
fc20299fda78be65822470409533f1710b0be228 30-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Don't disable IMS if SIM is not ready

Bug: 27904215
Change-Id: Ieb2688bb8bc4916c28d1e7d8a48f7bdc854582cb
rc/java/com/android/ims/ImsManager.java
03e73a2a1bf04907db64905f3423bf52dd2ffe2e 20-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
428d404237972ea63a4b91be1b102b29bb4544d6 26-Jan-2016 Gao Bing <w20090@motorola.com> Added RCS service.

1> PUBLISH
2> SUBSCRIBE
3> Periodically Capability polling

Bug: 23222011
Change-Id: I3160dfcadd85bb55e2c3033128a6766a005b68b0
ndroid.mk
cs/Android.mk
cs/presencepolling/Android.mk
cs/presencepolling/AndroidManifest.xml
cs/presencepolling/res/values/config.xml
cs/presencepolling/res/values/strings.xml
cs/presencepolling/src/com/android/service/ims/presence/AccountUtil.java
cs/presencepolling/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java
cs/presencepolling/src/com/android/service/ims/presence/CapabilityPolling.java
cs/presencepolling/src/com/android/service/ims/presence/ContactDbUtil.java
cs/presencepolling/src/com/android/service/ims/presence/Contacts.java
cs/presencepolling/src/com/android/service/ims/presence/DatabaseContentProvider.java
cs/presencepolling/src/com/android/service/ims/presence/DeviceBoot.java
cs/presencepolling/src/com/android/service/ims/presence/DeviceShutdown.java
cs/presencepolling/src/com/android/service/ims/presence/EABContactManager.java
cs/presencepolling/src/com/android/service/ims/presence/EABDbUtil.java
cs/presencepolling/src/com/android/service/ims/presence/EABProvider.java
cs/presencepolling/src/com/android/service/ims/presence/EABService.java
cs/presencepolling/src/com/android/service/ims/presence/InvalidDBException.java
cs/presencepolling/src/com/android/service/ims/presence/LauncherUtils.java
cs/presencepolling/src/com/android/service/ims/presence/PersistService.java
cs/presencepolling/src/com/android/service/ims/presence/PollingAction.java
cs/presencepolling/src/com/android/service/ims/presence/PollingService.java
cs/presencepolling/src/com/android/service/ims/presence/PollingTask.java
cs/presencepolling/src/com/android/service/ims/presence/PollingsQueue.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceBroadcastReceiver.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceContact.java
cs/presencepolling/src/com/android/service/ims/presence/PresencePreferences.java
cs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java
cs/presencepolling/src/com/android/service/ims/presence/SharedPrefUtil.java
cs/rcsmanager/Android.mk
cs/rcsmanager/AndroidManifest.xml
cs/rcsmanager/CleanSpec.mk
cs/rcsmanager/com.android.ims.rcsmanager.xml
cs/rcsmanager/src/java/com/android/ims/IRcsPresenceListener.aidl
cs/rcsmanager/src/java/com/android/ims/RcsException.java
cs/rcsmanager/src/java/com/android/ims/RcsManager.java
cs/rcsmanager/src/java/com/android/ims/RcsPresence.java
cs/rcsmanager/src/java/com/android/ims/RcsPresenceInfo.aidl
cs/rcsmanager/src/java/com/android/ims/RcsPresenceInfo.java
cs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java
cs/rcsmanager/src/java/com/android/ims/internal/EABContract.java
cs/rcsmanager/src/java/com/android/ims/internal/IRcsPresence.aidl
cs/rcsmanager/src/java/com/android/ims/internal/IRcsService.aidl
cs/rcsmanager/src/java/com/android/ims/internal/Logger.java
cs/rcsservice/Android.mk
cs/rcsservice/AndroidManifest.xml
cs/rcsservice/res/values/config.xml
cs/rcsservice/res/values/strings.xml
cs/rcsservice/src/com/android/service/ims/DeviceShutdown.java
cs/rcsservice/src/com/android/service/ims/LauncherUtils.java
cs/rcsservice/src/com/android/service/ims/RcsService.java
cs/rcsservice/src/com/android/service/ims/RcsServiceApp.java
cs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
cs/rcsservice/src/com/android/service/ims/RcsStackAdaptor.java
cs/rcsservice/src/com/android/service/ims/RcsUtils.java
cs/rcsservice/src/com/android/service/ims/Task.java
cs/rcsservice/src/com/android/service/ims/TaskManager.java
cs/rcsservice/src/com/android/service/ims/presence/AlarmBroadcastReceiver.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceAvailabilityTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceBase.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceCapabilityTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceInfoParser.java
cs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
cs/rcsservice/src/com/android/service/ims/presence/PresencePublishTask.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
cs/rcsservice/src/com/android/service/ims/presence/PresenceTask.java
cs/rcsservice/src/com/android/service/ims/presence/StackListener.java
rc/java/com/android/ims/ImsConfig.java
2cf680786ed97691b439e184c88fbc0552f81e81 15-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
ab48b7f15ee438d3c4bfffa799ab8f3a48158d8e 14-Mar-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of ce19b57ed5 to nyc-dev

Change-Id: Ie2312957799f5f5e35aec8767ea39ed2b7c37988
ce19b57ed5a90a099e43cca7ab7a6703ccd7173f 14-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Enable/Disable VT feature tag based on configuration" into mm-wireless-dev
8e14111c716d64163a703fd8e248c6a09ad44313 14-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Provide stub implementation for new IImsService method." into nyc-dev
2038a4aa1d8bc0a65cbb9a21911722ebe504e0c1 10-Mar-2016 Tyler Gunn <tgunn@google.com> Provide stub implementation for new IImsService method.

Bug: 27458894
Change-Id: I0b3684f8c084efa377849797957179141081154d
rc/java/com/android/ims/ImsServiceBase.java
07b427ca8e01edb2296f67f48d39711e92c413f2 10-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
5803ef02ee79649c8a341a251eb9084e7608257e 08-Mar-2016 fionaxu <fionaxu@google.com> Add default Carrier cfg for IMS_WFC

Bug: 26954117
Change-Id: I31ea307f83df0ba863ce27a2d078f72aa82087b3
rc/java/com/android/ims/ImsManager.java
c0f450d917e3511a10e737e3f263494e80cf9b44 11-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Enable/Disable VT feature tag based on configuration

Enable/Disable VT feature tag based on configuration instead
of directly depending on user TTY settings.

Bug: 27484239
Change-Id: Ie577a09d7a6fa03d64afc2f94c58c5cf41139355
rc/java/com/android/ims/ImsManager.java
3bcc692bbdf3a764c96cdd5b0d0014a7bf8726df 01-Mar-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
45eb22e8c84556bb9ccb25cb28b33ca74c55aeb9 01-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Print radio technology over which IMS call is placed" into mm-wireless-dev
am: 2b299c74f0

* commit '2b299c74f074c22e5507f05e48dcd9864ceb5336':
Print radio technology over which IMS call is placed
2b299c74f074c22e5507f05e48dcd9864ceb5336 01-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Print radio technology over which IMS call is placed" into mm-wireless-dev
50b03e9261c7717817ebfb8e4086f949d0ad9c18 29-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Print radio technology over which IMS call is placed

Bug: 22727930
Change-Id: Ibab94b096c965199653b1f87a9df21c24fe96d91
rc/java/com/android/ims/ImsCall.java
3ca66f56df44173517589bc51db01caaabbf7267 28-Feb-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
2f1af950957783010500e2c78b92b2b994560458 01-Feb-2016 Sungmin Choi <sungmin.choi@lge.com> 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
rc/java/com/android/ims/ImsManager.java
4dd9795b62fee6e75fae4aaee5ecb069a4ecfbd5 25-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev
am: 66ad4157f5

* commit '66ad4157f59141b396e7ffbad2f2f2b4b95e44ef':
Add registrationAssociatedUriChanged to ImsRegistrationListener
66ad4157f59141b396e7ffbad2f2f2b4b95e44ef 25-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev
d3b59a065c8137de66fbcf592e5a8852aff9062a 14-Feb-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to nyc-dev
4c1da288a61ca6ecbe08ed18f89db978479f24b8 12-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS RAT Reporting in Registration Callbacks
am: a7ced64be6

* commit 'a7ced64be6f5c8e0e1c9e2a9a0a51c7eb324ca4d':
IMS RAT Reporting in Registration Callbacks
4de9cbb93b842385b511106fb72cdbfcd59bc3d6 12-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Add registrationAssociatedUriChanged to ImsRegistrationListener

Update ImsManager to reflect changes in AIDL

Bug: 24613146
Change-Id: I91847b7051af49dfb8cec726daea18957a9acea1
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
a7ced64be6f5c8e0e1c9e2a9a0a51c7eb324ca4d 05-May-2015 Omkar Kolangade <omkark@codeaurora.org> 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
rc/java/com/android/ims/ImsManager.java
765f7b80c645036972777d9abd7cf265cbbadf94 07-Feb-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to master
eced23013075769cf671bb6f43a9c63febde3e80 05-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Video Quality Constants (VT)
am: 255dca28a4

* commit '255dca28a46aa31b70b64244f8beb1c9a965e7e1':
IMS: Video Quality Constants (VT)
255dca28a46aa31b70b64244f8beb1c9a965e7e1 29-Jan-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Video Quality Constants (VT)

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

Change-Id: Ief2583c8d4a0e8167bbb4916ebab8f16f5002d3f
rc/java/com/android/ims/ImsConfig.java
6c8518448dd02bf66de81d8422d86c4da72527bb 02-Feb-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to master
78fc8b81811e1d71e4f80480b713ad444ba69465 02-Feb-2016 The Android Automerger <android-build@google.com> merge in nyc-release history after reset to master
79bdd0905db4e9f93d136ee43e3eee4fbcd5507d 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev
am: 9df7c39174

* commit '9df7c391748b141c957222ab41e955fbd21633fb':
ImsManager: Allow to set ImsConfigListener
9df7c391748b141c957222ab41e955fbd21633fb 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "ImsManager: Allow to set ImsConfigListener" into mm-wireless-dev
77941f0a7a84d5a260bbb4dc0ea957d24cb05b2b 27-Jan-2016 Tyler Gunn <tgunn@google.com> 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
f4b90329c282a985e820169b9f7d350537f19ac7 26-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> ImsManager: Allow to set ImsConfigListener

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

Change-Id: Idabdc12fa0737957abda1410adef40a6bf29c600
rc/java/com/android/ims/ImsManager.java
e1f8fa7b50f881d457431a0965579b1259b95b91 26-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Update host call callProfile on conference success" into mm-wireless-dev
b7e91bb57207188335a01c9d3e57b2ac27d3f677 25-Jan-2016 Anju Mathapati <anjucm@codeaurora.org> 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
1c1088887347d682b7b186027d98ad3617dcfb68 17-Nov-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Update host call callProfile on conference success

Update host call callProfile on conference success

Change-Id: I58ffb8214aef030bdc17b19e1112d4954e323e25
BUG=26772683
rc/java/com/android/ims/ImsCall.java
0f108033df343d446e42c403494cc2ab079895d5 10-Oct-2015 Anju Mathapati <anjucm@codeaurora.org> 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
rc/java/com/android/ims/ImsCall.java
5b09c33ad74aa3b54e6f626891665606c2aa388b 30-Dec-2015 Jack Yu <jackyu@google.com> Added dump support to more telephony components.
am: 2f102bd7c0

* commit '2f102bd7c09024d68a12594882d0f9313149dd1a':
Added dump support to more telephony components.
2f102bd7c09024d68a12594882d0f9313149dd1a 29-Dec-2015 Jack Yu <jackyu@google.com> 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
rc/java/com/android/ims/ImsManager.java
86f08020cca0000d722affa86536ff49dad01844 23-Dec-2015 Alex Cheung <alexcheung@google.com> Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
c65739a4beb1868151a4495c0799486bc4c1baa2 23-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Update ImsManager to use CarrierConfigManager"
4ca0cde8fa786f3b1119cebe995ebea2acdff107 23-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> Update ImsManager to use CarrierConfigManager

This code was not updated in branch it came from.

Change-Id: I1e9d41f0ead15c9fea8c839ff36a6bb567bf67ed
rc/java/com/android/ims/ImsManager.java
04f25bdfa3ce2f8e14f9c774bb67e8a3f59def08 22-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> 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
9510b1cb97fd77cb6a595b91405cbf0a8a4c426e 18-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> 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
rc/java/com/android/ims/ImsManager.java
144043c23a27ef1c35ac7b5d73b66c42722ccbe2 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '16516864151ba277ca16e708fa3fe61f6d5384c9' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
f14f94207ff8156fdd6d41776910aa7f3fa7ce0c 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Change-Id: I3a24f26df9ae1813f3ffc05501ae78e794ec814e
26675a8d658a04b96a952761e199037471d65dfe 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit 'df393e9776b983c51c97c1343032bfa9d20f39a3' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
85cbc37cd0c372ffdeac4bfcd2adcef5b294001d 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '3801547b13b58a5fae868652ed04eacd1940cd81' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
d2969f52c329061eb77f9e89e5c187738ccb800b 10-Nov-2015 Pavel Zhamaitsiak <pavelz@google.com> Add factoryReset() function to ImsManager

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

Bug: 25300757
Change-Id: I747f6d90e513f8b2243289e420be4faca86a0312
rc/java/com/android/ims/ImsManager.java
2dd6c3f7787a53c271a12890017d607d5648a4fa 08-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> Add factoryReset() function to ImsManager
am: 8c065f5f1b

* commit '8c065f5f1bc66bec1c12cdd156b90f1cb0e98df8':
Add factoryReset() function to ImsManager
aec6b97770647a5cf6b524998ebd081b0e8f0b07 24-Oct-2014 Omkar Kolangade <omkark@codeaurora.org> Add Exception Handling To setAdvanced4GMode API

Added a try-catch block to handle ImsException.

Bug: 21800429
Change-Id: I335e2db69348cd617100b65184ee1b970e7bc11c
a7d32e8db738c2b3ff24d6d4e208e3c1d5660db8 05-May-2015 Etan Cohen <etancohen@google.com> Added API to configure VT over IMS.

Bug: 20750301
Change-Id: Iecad593e8f7aa5a76a37ff63e9ff9b9536827a5c
rc/java/com/android/ims/ImsManager.java
8c065f5f1bc66bec1c12cdd156b90f1cb0e98df8 10-Nov-2015 Pavel Zhamaitsiak <pavelz@google.com> Add factoryReset() function to ImsManager

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

Bug: 25300757
Change-Id: I747f6d90e513f8b2243289e420be4faca86a0312
rc/java/com/android/ims/ImsManager.java
4056b18e981ba432001584d0abf05d8a1467bf40 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> IMS: Add check for GBA SIM
am: 57911d120a

* commit '57911d120a57beb906c00cfddbdae38249b205e7':
IMS: Add check for GBA SIM
16516864151ba277ca16e708fa3fe61f6d5384c9 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> IMS: Add check for GBA SIM
am: 57911d120a

* commit '57911d120a57beb906c00cfddbdae38249b205e7':
IMS: Add check for GBA SIM
57911d120a57beb906c00cfddbdae38249b205e7 20-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> IMS: Add check for GBA SIM

Bug: 23731243
Change-Id: Iff8d9696a672f44b28adbfe2a7a147133247f815
rc/java/com/android/ims/ImsManager.java
71ab9b45161aa59d648829592e347edd13930932 12-Oct-2015 Anju Mathapati <anjucm@codeaurora.org> am 14077be0: IMS: Dont clean merge info on host termination

* commit '14077be065f36916aceebcfab79f92024f4ed73c':
IMS: Dont clean merge info on host termination
0b7df2d5180cb8332f26ccc39e22fe04cc6d75cb 11-Oct-2015 Anju Mathapati <anjucm@codeaurora.org> am 14077be0: IMS: Dont clean merge info on host termination

* commit '14077be065f36916aceebcfab79f92024f4ed73c':
IMS: Dont clean merge info on host termination
14077be065f36916aceebcfab79f92024f4ed73c 25-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> 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
rc/java/com/android/ims/ImsCall.java
ad05a6594d092c53bb62791cee61e7c88e510031 14-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> am d0fb6640: Transfer participants during 3 way conference

* commit 'd0fb66402074528deccd6a85f3d1eca8d2d0714f':
Transfer participants during 3 way conference
214168eaec6af438da3b63f079757f4fe0a9d759 14-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> am d0fb6640: Transfer participants during 3 way conference

* commit 'd0fb66402074528deccd6a85f3d1eca8d2d0714f':
Transfer participants during 3 way conference
d0fb66402074528deccd6a85f3d1eca8d2d0714f 22-Jul-2015 Anju Mathapati <anjucm@codeaurora.org> 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
rc/java/com/android/ims/ImsCall.java
8f4851be82c41ae74c5282de07e210df37b3bcfd 11-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am b4cb8cad: Merge "Fix typos" into mnc-dr-dev

* commit 'b4cb8cad7ae78f5fa384dbd19e8bb350ee315914':
Fix typos
9ef47334ba02ce5bcfecb1691e4edfccb9474026 11-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am b4cb8cad: Merge "Fix typos" into mnc-dr-dev

* commit 'b4cb8cad7ae78f5fa384dbd19e8bb350ee315914':
Fix typos
b4cb8cad7ae78f5fa384dbd19e8bb350ee315914 11-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Fix typos" into mnc-dr-dev
e6f9943a507620ed4952cd2729693accf2a29af8 11-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix typos

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

Bug: 23754677
Bug: 23931295
Change-Id: I3be431404a770d41eec883d4c36f80c111fd9a97
rc/java/com/android/ims/ImsManager.java
7669011670c16fa0bc1cf19aefb12586e5d96d0a 11-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> am 818c09d7: IMS: Clean peer & host during conference failure

* commit '818c09d7b55d3257e91e528749587349f7197e3f':
IMS: Clean peer & host during conference failure
e03f3d67ed408bf45c6f091170f716723545828b 11-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> am 818c09d7: IMS: Clean peer & host during conference failure

* commit '818c09d7b55d3257e91e528749587349f7197e3f':
IMS: Clean peer & host during conference failure
818c09d7b55d3257e91e528749587349f7197e3f 31-Aug-2015 Anju Mathapati <anjucm@codeaurora.org> 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
rc/java/com/android/ims/ImsCall.java
916c968a9271277cd31b8a96efda9a1ce518428c 09-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> 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
deff4be65cc9a052f73997df47b43031329c335f 09-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> 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
198a2553edd7182ee0da5df306016bbe7f427c0a 09-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Ensure IMS is turned On or Off when synchronizing settings with ImsConfig" into mnc-dr-dev
a7bf2167a940a0278e5caf9a6830f8edb32c2053 09-Sep-2015 Tyler Gunn <tgunn@google.com> am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

* commit '4f14347f9149b8827d344770307bdf442cd2ff0d':
Fix potential NPE in ImsCall notifyConferenceStateUpdated.
f35f867398d41594b7c6d99978d4f42b77ce1551 09-Sep-2015 Tyler Gunn <tgunn@google.com> am 4f14347f: Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev

* commit '4f14347f9149b8827d344770307bdf442cd2ff0d':
Fix potential NPE in ImsCall notifyConferenceStateUpdated.
4f14347f9149b8827d344770307bdf442cd2ff0d 09-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Fix potential NPE in ImsCall notifyConferenceStateUpdated." into mnc-dr-dev
dc16e458bb57bc48958259e893ad52280247dcc4 09-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Ensure IMS is turned On or Off when synchronizing settings with ImsConfig

Bug: 23219836
Change-Id: I0830bf6071841d2822038f737d935351a9ddebe4
rc/java/com/android/ims/ImsManager.java
9e3452a8efa430f9ca04379be3da6baf0bb0f51a 08-Sep-2015 Tyler Gunn <tgunn@google.com> 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
rc/java/com/android/ims/ImsCall.java
ad3f59fe18b3064a3af03c9427b89a8f32586c8e 07-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am 8ca52ff8: Add ImsManager.updateImsServiceConfig() function

* commit '8ca52ff89d9f43cf1ff04d1d607a0b904e749a82':
Add ImsManager.updateImsServiceConfig() function
874bb1e6d94f94506b9ff507fa42a320064b5e52 05-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am 8ca52ff8: Add ImsManager.updateImsServiceConfig() function

* commit '8ca52ff89d9f43cf1ff04d1d607a0b904e749a82':
Add ImsManager.updateImsServiceConfig() function
8ca52ff89d9f43cf1ff04d1d607a0b904e749a82 05-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> 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
rc/java/com/android/ims/ImsManager.java
adad856b4d51b20e69a0ef84a419395bbe66bd77 07-Aug-2015 Anthony Lee <anthonylee@google.com> am e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev

* commit 'e5f508cc81f3b5d913f64bff615f72ddab5a7c6a':
IMS : UT Service Capability
5ce1762365a782adb1cbcecd516e03088f5239e0 07-Aug-2015 Anthony Lee <anthonylee@google.com> am e5f508cc: Merge "IMS : UT Service Capability" into mnc-dr-dev

* commit 'e5f508cc81f3b5d913f64bff615f72ddab5a7c6a':
IMS : UT Service Capability
e5f508cc81f3b5d913f64bff615f72ddab5a7c6a 07-Aug-2015 Anthony Lee <anthonylee@google.com> Merge "IMS : UT Service Capability" into mnc-dr-dev
c33044fbfdf0430e4735c12056a0b091df0d0ee0 07-Aug-2015 Pavel Zhamaitsiak <pavelz@google.com> resolved conflicts for merge of 47b08cf5 to mnc-vt-dev

Change-Id: I0e70fb526f50c30cd44db9ffaf46e47ab48faa9e
1d4a9a47e0c28988fe46a37969f2c39e31a16be1 10-Nov-2014 Anju Mathapati <anjucm@codeaurora.org> IMS : UT Service Capability

1) Added new feature flag i.e UT service

Change-Id: I4cf0edf62dd75ce0239d37c3d7b8520c666df14b
Bug: 21850717
rc/java/com/android/ims/ImsConfig.java
ddfcdd6c6fcf318beb31817d9beb4acbdf104422 06-Aug-2015 Omkar Kolangade <omkark@codeaurora.org> am 47b08cf5: am 75f3ca3a: Fix unncessary IMS re-registration with network

* commit '47b08cf53506535d702cfb1971d375db5dcf39e3':
Fix unncessary IMS re-registration with network
47b08cf53506535d702cfb1971d375db5dcf39e3 06-Aug-2015 Omkar Kolangade <omkark@codeaurora.org> am 75f3ca3a: Fix unncessary IMS re-registration with network

* commit '75f3ca3a51c8d16dbb83af1cfcc151ec596dc5f5':
Fix unncessary IMS re-registration with network
75f3ca3a51c8d16dbb83af1cfcc151ec596dc5f5 24-Oct-2014 Omkar Kolangade <omkark@codeaurora.org> 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
rc/java/com/android/ims/ImsManager.java
c1872ddfb0f8a203d6f590f9b5cd374c8876144b 29-Jul-2015 Nathan Harold <nharold@google.com> am 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

* commit '0e4c7c103ee34f974334fa949570650e2780e8bc':
Prevent WFC Settings changes from impacting VoLTE Settings
70617d2e7c7e5911fdbdb08a0dc0459febbd18e0 28-Jul-2015 Nathan Harold <nharold@google.com> am 0e4c7c10: am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

* commit '0e4c7c103ee34f974334fa949570650e2780e8bc':
Prevent WFC Settings changes from impacting VoLTE Settings
0e4c7c103ee34f974334fa949570650e2780e8bc 28-Jul-2015 Nathan Harold <nharold@google.com> am 3a99f787: Prevent WFC Settings changes from impacting VoLTE Settings

* commit '3a99f7878b7f4fb49f3f383272b7ba56b99904ee':
Prevent WFC Settings changes from impacting VoLTE Settings
3a99f7878b7f4fb49f3f383272b7ba56b99904ee 25-Jul-2015 Nathan Harold <nharold@google.com> Prevent WFC Settings changes from impacting VoLTE Settings

Bug: 22609300
Change-Id: I36fb3d1254c9168eb5978de1e39e6541d9c37df3
rc/java/com/android/ims/ImsManager.java
d95787df2e08f20916bf8de32e30fd796007b5e3 24-Jul-2015 Anthony Lee <anthonylee@google.com> am 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

* commit '5e2ca1726a9704e92028179de3bf83626e3e9612':
Handle hangup for 4 way conference scenario
1edca340159b5e020ec0827fdfa6edfc759ab166 24-Jul-2015 Tyler Gunn <tgunn@google.com> 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.
dce8d77f458f69b1f043bd0518aa9fce364ae2bd 24-Jul-2015 Junda Liu <junda@google.com> 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.
dc0db4f54b80f3121ccfe36b79f54f7411fbc614 24-Jul-2015 Anthony Lee <anthonylee@google.com> am 5e2ca172: am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

* commit '5e2ca1726a9704e92028179de3bf83626e3e9612':
Handle hangup for 4 way conference scenario
92d86953d89f821f12983f9c6fbc3d96ebb4a3a2 24-Jul-2015 Tyler Gunn <tgunn@google.com> 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.
e0728f8239757ebc0850bdfd8fedf248e65ca401 24-Jul-2015 Junda Liu <junda@google.com> 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.
5e2ca1726a9704e92028179de3bf83626e3e9612 23-Jul-2015 Anthony Lee <anthonylee@google.com> am 22444533: Merge "Handle hangup for 4 way conference scenario" into mnc-dev

* commit '22444533a7c42c71dad746322094777fee352d3c':
Handle hangup for 4 way conference scenario
22444533a7c42c71dad746322094777fee352d3c 23-Jul-2015 Anthony Lee <anthonylee@google.com> Merge "Handle hangup for 4 way conference scenario" into mnc-dev
77e4256dcb15e55e1dd09904fe7847df6be3aa02 23-Jul-2015 Tyler Gunn <tgunn@google.com> 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.
245869b403c10a26dee0632b7b1154652b4aa163 23-Jul-2015 Junda Liu <junda@google.com> 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.
89efc518fc673977cb768b322a9f88d36e971904 23-Jul-2015 Tyler Gunn <tgunn@google.com> Merge "Support termination of a call while merge is in process." into mnc-dev
95d563ed2a215d67a4f789c3ebb5a526fb95cc7f 23-Jul-2015 Tyler Gunn <tgunn@google.com> 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
rc/java/com/android/ims/ImsCall.java
eb9a8ab415c8c9c0bf54104b2b6f858e83802ba2 23-Jul-2015 Junda Liu <junda@google.com> Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
7e16d5de947db5fb27c25b5a659f1a5233a52857 22-Jul-2015 Junda Liu <junda@google.com> Remove volte_feature_disabled as carrier config handled it.

Bug: b/22602876
Change-Id: I8941162f6ece7ffa840401b7b55a3cd770c3b959
rc/java/com/android/ims/ImsManager.java
d9ed874439293ed6c34ce27a3689711c986f977b 17-Jul-2015 Anju Mathapati <anjucm@codeaurora.org> 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
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
4893631b1e2949e9845782fd3f55e7145670b77f 16-Jul-2015 Tyler Gunn <tgunn@google.com> am 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.

* commit '102b0ede9371abb333c0a644c026dc667b51b3db':
Add method and perform cleanups in ImsCall.
b2ab9aae5f263e901102ed1b00f76797aef3d013 16-Jul-2015 Tyler Gunn <tgunn@google.com> am 102b0ede: am 6c0b0d0e: Add method and perform cleanups in ImsCall.

* commit '102b0ede9371abb333c0a644c026dc667b51b3db':
Add method and perform cleanups in ImsCall.
102b0ede9371abb333c0a644c026dc667b51b3db 16-Jul-2015 Tyler Gunn <tgunn@google.com> am 6c0b0d0e: Add method and perform cleanups in ImsCall.

* commit '6c0b0d0e83b8d06f40ec814573adc69f362704a9':
Add method and perform cleanups in ImsCall.
6c0b0d0e83b8d06f40ec814573adc69f362704a9 02-Jul-2015 Tyler Gunn <tgunn@google.com> 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
rc/java/com/android/ims/ImsCall.java
7f1f05d650b843ac5b2d75c0d89897029a99e048 10-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 394bd1e6: Add config items for Korea market

* commit '394bd1e6bd4392bad9973ffcd808c4b4de2b61ba':
Add config items for Korea market
e2bc9fcf69afab079034bb7e89875318a07966df 10-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 394bd1e6: Add config items for Korea market

* commit '394bd1e6bd4392bad9973ffcd808c4b4de2b61ba':
Add config items for Korea market
394bd1e6bd4392bad9973ffcd808c4b4de2b61ba 23-Jun-2015 Shriram Ganesh <sganesh@codeaurora.org> Add config items for Korea market

Bug: 22170629
Change-Id: I7d923a3180e0ca1b0eae7f8c34bb4d9765949847
rc/java/com/android/ims/ImsConfig.java
6fb69946fedb697388d645651dd3f9a1ab9c9797 08-Jul-2015 Etan Cohen <etancohen@google.com> am b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'b2770866aac802be13a3f6e7fdd61e2c1c0d2dc4':
Remove permission check from client-side code - ineffective.
360bc8a10c5c54a663c482b972b7204b2c4f8730 08-Jul-2015 Etan Cohen <etancohen@google.com> am b2770866: am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'b2770866aac802be13a3f6e7fdd61e2c1c0d2dc4':
Remove permission check from client-side code - ineffective.
b2770866aac802be13a3f6e7fdd61e2c1c0d2dc4 08-Jul-2015 Etan Cohen <etancohen@google.com> am e0b0ddeb: Remove permission check from client-side code - ineffective.

* commit 'e0b0ddebe63d31ea31d48d4d647778b9035b18f0':
Remove permission check from client-side code - ineffective.
38eae50b5513aecd437c1f60f5e76b3f98005b8c 08-Jul-2015 Etan Cohen <etancohen@google.com> 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
e0b0ddebe63d31ea31d48d4d647778b9035b18f0 01-Jul-2015 Etan Cohen <etancohen@google.com> Remove permission check from client-side code - ineffective.

Will be added to server side code.

Bug: 17361897
Change-Id: I417a050135ead6023f996a8ea84495e1e9355a97
rc/java/com/android/ims/ImsConfig.java
a904c2c19b5ba8f4efbf6600a0d5065b16fc60c9 07-Jul-2015 Etan Cohen <etancohen@google.com> 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
4a501ab0b47cd15fa2a2aa08936ede1c2a052187 07-Jul-2015 Jonathan Basseri <misterikkit@google.com> am 2acea6f9: Check for null config from CarrierConfigManager.

* commit '2acea6f98afe057fa1a3faf744b240563cdf6ee2':
Check for null config from CarrierConfigManager.
4c68267e68b41dd7a4af7757b412d0a5faff94da 07-Jul-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev

* changes:
Stub base class implementation for some IMS interfaces
IMS: Add an extra for ims phantom MO call.
MWI,phantom call,Suppl services
0b8f6e87d8896b2b0a51181aff1f0dad21377589 06-Jul-2015 Jonathan Basseri <misterikkit@google.com> am 2acea6f9: Check for null config from CarrierConfigManager.

* commit '2acea6f98afe057fa1a3faf744b240563cdf6ee2':
Check for null config from CarrierConfigManager.
eea3d44c049ec27c98c531b5f05b1c2d267cba73 06-Aug-2014 Etan Cohen <etancohen@google.com> Stub base class implementation for some IMS interfaces

OEM implementations should sub-class ImsServiceBase and ImsCallSessionListenerBase.
Allows changing the IImsService and IImsCallSessionListener interfaces without breaking
legacy implementations.

Note: main purpose is to allow staged implementations across different
architectures - not to deploy default/stubbed service implementations.

Change-Id: I5874854186456f5853627fbbf3d3b48a71636a72
rc/java/com/android/ims/ImsCallSessionListenerBase.java
rc/java/com/android/ims/ImsServiceBase.java
9c0337960dbe774b52daa39f99acae50c8230324 17-Jun-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Add an extra for ims phantom MO call.

A boolean parameter EXTRA_IS_UNKNOWN_CALL is added to denote
whether the call provided in ACTION_IMS_INCOMING_CALL is an
unknown dialing call

Change-Id: I4b9c2ed49995b29834560bbfbedd99b5f1f85eb7
Bug: 21877055
rc/java/com/android/ims/ImsManager.java
d3adfadd868b19e2423674bfefa5ba778f743bf2 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services
3. IMS: CallForward Unconditional Timer
- Add new API for callforward
unconditional timer in aidl file.

4. IMS : Incoming Call Barring
- Added new field to display ICB
anonymous number.
- Modified existing API to support
request like registration,activation,
deactivation,erasure,interogation.

5.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

6. Don't reset mUpdateRequest flag upon
receiving call update notification,
oncallSessionUpdated().

7. Reset mHold variable when hold request failed
reset mHold variable so that ImsCall's state corresponds to the
actual state of the call

Change-Id: I7a0293d21fca4bf40dbe764c5d9d9dbb8665d55d
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
rc/java/com/android/ims/internal/ImsCallSession.java
2acea6f98afe057fa1a3faf744b240563cdf6ee2 02-Jul-2015 Jonathan Basseri <misterikkit@google.com> Check for null config from CarrierConfigManager.

CarrierConfigManager can return a null bundle if an error occurred (e.g.
RemoteException) We received dozens of reports indicating that had
occurred at this call site, but they did not include logs explaining why
CarrierConfigManager had returned null. (see bug)

Bug: 22230051
Change-Id: I11f5ed44696d0ef8465e33bbed7abfb8b354d40a
rc/java/com/android/ims/ImsManager.java
b6bbd8f962ff0e1bd0c1cd9ed94af8bf8f2367df 25-Jun-2015 Junda Liu <junda@google.com> am e7663c09: Update ImsManager to use carrier configs.

* commit 'e7663c09acfdfa34d423be3c1ac7fecf2eb5e3e1':
Update ImsManager to use carrier configs.
0b9e3f5757cba635a88cc050afbe10c086ab8c7f 25-Jun-2015 Junda Liu <junda@google.com> am e7663c09: Update ImsManager to use carrier configs.

* commit 'e7663c09acfdfa34d423be3c1ac7fecf2eb5e3e1':
Update ImsManager to use carrier configs.
e7663c09acfdfa34d423be3c1ac7fecf2eb5e3e1 23-Jun-2015 Junda Liu <junda@google.com> Update ImsManager to use carrier configs.

Various carrier settings have been migrated to carrier config manager, so we update the call sites in ImsManager.

Bug: b/21878236
Change-Id: I20dcfba6e71f7db4961ff17f059e1a139c9958d7
rc/java/com/android/ims/ImsManager.java
4cf372979cf216972c2182e8e1c75dd1d87136b3 06-Aug-2014 Etan Cohen <etancohen@google.com> Stub base class implementation for some IMS interfaces

OEM implementations should sub-class ImsServiceBase and ImsCallSessionListenerBase.
Allows changing the IImsService and IImsCallSessionListener interfaces without breaking
legacy implementations.

Note: main purpose is to allow staged implementations across different
architectures - not to deploy default/stubbed service implementations.

Change-Id: I5874854186456f5853627fbbf3d3b48a71636a72
rc/java/com/android/ims/ImsCallSessionListenerBase.java
rc/java/com/android/ims/ImsServiceBase.java
02c72def1a67d98147d6635e0bd880b8c5d99fa4 17-Jun-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Add an extra for ims phantom MO call.

A boolean parameter EXTRA_IS_UNKNOWN_CALL is added to denote
whether the call provided in ACTION_IMS_INCOMING_CALL is an
unknown dialing call

Change-Id: I4b9c2ed49995b29834560bbfbedd99b5f1f85eb7
Bug: 21877055
rc/java/com/android/ims/ImsManager.java
d48111157a7472d2a301f67796af4e9e288db0f8 05-May-2015 Omkar Kolangade <omkark@codeaurora.org> 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: I18f77f502ffae152cca1f53b31698358f9a869b9
rc/java/com/android/ims/ImsManager.java
4c81117cd793aef6919495f5928a46f265d3ef7c 24-Oct-2014 Omkar Kolangade <omkark@codeaurora.org> Add Exception Handling To setAdvanced4GMode API

Added a try-catch block to handle ImsException.

Bug: 21800429
Change-Id: I335e2db69348cd617100b65184ee1b970e7bc11c
rc/java/com/android/ims/ImsManager.java
4a6f92c3c623baea31d87b8ecec096183d67f8bd 11-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am 95be7c68: IMS: Conference changes

* commit '95be7c68495a3a22c45b8d7867bf5c0246513adb':
IMS: Conference changes
df393e9776b983c51c97c1343032bfa9d20f39a3 11-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am 95be7c68: IMS: Conference changes

* commit '95be7c68495a3a22c45b8d7867bf5c0246513adb':
IMS: Conference changes
95be7c68495a3a22c45b8d7867bf5c0246513adb 07-May-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: Conference changes

CL is handling refer failure for -
- held call in 3 way merge
- active call in 3 way merge
- active call in 4 way merge

Bug: 20224516, 20232100
Change-Id: I69a006cdedf705762d8494d0da6796884c8631a2
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
8887294f480ccedb16c1938c2214e08580d2d7cc 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services
3. IMS: CallForward Unconditional Timer
- Add new API for callforward
unconditional timer in aidl file.

4. IMS : Incoming Call Barring
- Added new field to display ICB
anonymous number.
- Modified existing API to support
request like registration,activation,
deactivation,erasure,interogation.

5.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

6. Don't reset mUpdateRequest flag upon
receiving call update notification,
oncallSessionUpdated().

7. Reset mHold variable when hold request failed
reset mHold variable so that ImsCall's state corresponds to the
actual state of the call

Change-Id: I7a0293d21fca4bf40dbe764c5d9d9dbb8665d55d
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
rc/java/com/android/ims/internal/ImsCallSession.java
35bfab4af2c1679d606ffc62989855e908869f43 02-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am a1ed7b09: IMS: Ims Conference fixes

* commit 'a1ed7b0957567367d0e782ee6ce1db265d028ece':
IMS: Ims Conference fixes
349589621575e9209af1302be1db1348cefa104a 02-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am a1ed7b09: IMS: Ims Conference fixes

* commit 'a1ed7b0957567367d0e782ee6ce1db265d028ece':
IMS: Ims Conference fixes
a1ed7b0957567367d0e782ee6ce1db265d028ece 20-May-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: Ims Conference fixes

Conference fixes

- Don't reset mUpdateRequest flag upon
receiving call update notification,
oncallSessionUpdated().
- Reset mHold variable when hold request failed
- Update Participants information after
processmergecomplete
- Update only active participants in Conference List
- Reset mHold variable when resume request failed
- Fix crash when participant leaves from conference
- IMS conference participant API

Change-Id: I3e0b1dc3864aa697f5ba5db7ba468bece09b1ea6
Bug: 21376607
rc/java/com/android/ims/ImsCall.java
8237b306ef25add702ea13510b642ef070b186c5 26-May-2015 Etan Cohen <etancohen@google.com> Merge commit 'acae2e4' into merge
3801547b13b58a5fae868652ed04eacd1940cd81 26-May-2015 Etan Cohen <etancohen@google.com> Merge commit '6f3737f' into merge
8991312e4d4f33e32b848e8d3f1c43af5b26bb22 26-May-2015 Etan Cohen <etancohen@google.com> Merge commit '48b9589' into merge
b8fd96b04a7a2ea6add771c55298231178931a22 22-May-2015 Etan Cohen <etancohen@google.com> Merge "Revert "Merge commit '6f3737f' into merge""
d2a011a27f3f281510ac60c3729eebb82b18cbe4 22-May-2015 Etan Cohen <etancohen@google.com> Merge "Revert "Merge commit '48b9589' into merge""
161b1b839f6c93ec8f4a019d8536cd30b63f7214 22-May-2015 Etan Cohen <etancohen@google.com> Revert "Merge commit '6f3737f' into merge"

This reverts commit 5f4406f0bb8bab1fcd33b52a08fb79ed8ba7a742.

Change-Id: I85afceb67112a772cedf4a902714d28c81900312
rc/java/com/android/ims/ImsManager.java
8bdd68522c124472c2fd2eb8266d848f208fe449 22-May-2015 Etan Cohen <etancohen@google.com> Revert "Merge commit 'acae2e4' into merge"

This reverts commit 8b99d7d5c174cbd2c4f6fef4f31dcd70564abbb8.

Change-Id: I0dd2b7f3640e9aa2151e2d26af13be2376394294
487efc64c9adec6b763cb7776fb3cb5f22aa0850 22-May-2015 Etan Cohen <etancohen@google.com> Revert "Merge commit '48b9589' into merge"

This reverts commit 2fa9007c902224e08f1cf8377c6469f0ea2222b2.

Change-Id: I4f05872eb477b5b6be819f90869a40a20f328570
8b99d7d5c174cbd2c4f6fef4f31dcd70564abbb8 22-May-2015 Etan Cohen <etancohen@google.com> Merge commit 'acae2e4' into merge
5f4406f0bb8bab1fcd33b52a08fb79ed8ba7a742 22-May-2015 Etan Cohen <etancohen@google.com> Merge commit '6f3737f' into merge
2fa9007c902224e08f1cf8377c6469f0ea2222b2 22-May-2015 Etan Cohen <etancohen@google.com> Merge commit '48b9589' into merge
acae2e4aa41f4e54c2a54efc68c8162014caf98d 12-May-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Fixes for APi review

Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
085d0bde9eae677d403b9725f4e0f7ea22a6cf60 13-May-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE More video related API fixes

android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
95bd67621513f910787214f07c37f0d366ffaf37 13-May-2015 Yorke Lee <yorkelee@google.com> More video related API fixes

android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
33d827a95dcb4e007c3e94a591fe1c02fe3d7836 12-May-2015 Yorke Lee <yorkelee@google.com> Fixes for APi review

Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
0a625b7ee9586e573442629beb4ac833d45f6e0d 06-May-2015 Tyler Gunn <tgunn@google.com> Change sendSessionModifyRequest VideoProvider API signature.

Bug: 20704229
Change-Id: I7650b6ae21532b10f901449f702f3a4b59477696
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
6f3737f5b42845db52084702f08a1d7119db1bc4 05-May-2015 Etan Cohen <etancohen@google.com> Added API to configure VT over IMS.

Bug: 20750301
Change-Id: Iecad593e8f7aa5a76a37ff63e9ff9b9536827a5c
rc/java/com/android/ims/ImsManager.java
48b9589b8e85d74af982c2aee173da433d54a77d 01-May-2015 Tyler Gunn <tgunn@google.com> Change sendSessionModifyRequest VideoProvider API signature.

Bug: 20704229
Change-Id: I7650b6ae21532b10f901449f702f3a4b59477696
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
eb13a596a4e19aacffe22fa6d3be88c53816932c 27-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Wi-Fi Calling default setting - Off

Bug: 20626411
Change-Id: I0647f7d82f36b2fadd079250b5ba5e3f6d1de3f9
(cherry picked from commit fa380e67d66a0a6c5e2ae13a3ca983f00d86e8cd)
rc/java/com/android/ims/ImsManager.java
c0ce8951bf48ab21e31aad5e892c96da283d3494 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '7df3df8' into merge2
3f0c3ab68c6bd6155a813764db148ef06d08fea2 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'e691706' into merge2
7df3df8367c26af4f54994b563e4db393ae5f64a 16-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Remove connection substate

Bug:20300433
Change-Id: Ieb83fb0b71eaf948c19241ec59411b3d434fae33
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
e5354df9dd85f16f9b68bf93e8aa782efedad5d7 16-Apr-2015 Jay Shrauner <shrauner@google.com> Remove connection substate

Bug:20300433
Change-Id: Ieb83fb0b71eaf948c19241ec59411b3d434fae33
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
e69170655c1f889f0ea212f5de3270fbbfaa5cef 15-Apr-2015 Jonathan Basseri <misterikkit@google.com> Fixing use of subId where phoneId was expected.
automerge: d713365

* commit 'd7133654b09bffcada982d2a5d37d0eeb0ffbd2d':
Fixing use of subId where phoneId was expected.
c5902a8a92f8c88d05f6b74499c219baab15984a 15-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix compilation error.
automerge: 691a1cc

* commit '691a1cc831e1bade18cb39f917f9aebbb5939ab8':
Fix compilation error.
3aa94b061b774e780aa8126b277a0e3c8ae1c2a5 14-Apr-2015 Tyler Gunn <tgunn@google.com> Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
automerge: 6e0a2ef

* commit '6e0a2ef3da064aa783a827d8f3857b994e92b716':
Prevent merging conference calls hosted on peer device.
d7133654b09bffcada982d2a5d37d0eeb0ffbd2d 08-Apr-2015 Jonathan Basseri <misterikkit@google.com> Fixing use of subId where phoneId was expected.

Change-Id: I96eda538d40dc863823d3fae4782e10da345899e
rc/java/com/android/ims/ImsManager.java
e9c8ddb47753fbc88849c8b42673e4ed8b0ed05b 10-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit '5aec2e957365f20b2e75d3b8c7034e3289729b81' into merge_work
691a1cc831e1bade18cb39f917f9aebbb5939ab8 09-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix compilation error.

Change-Id: Ia2c46f1fd9e2a34481690687745d88fb1b0a861f
rc/java/com/android/ims/ImsCall.java
6e0a2ef3da064aa783a827d8f3857b994e92b716 08-Apr-2015 Tyler Gunn <tgunn@google.com> Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
5aec2e957365f20b2e75d3b8c7034e3289729b81 24-Mar-2015 Rekha Kumar <rekhak@codeaurora.org> IMS-VT: Fix propagation of device orientation.
Orientation received at VT Service is incorrect.
Fixed propagation of device orientation to VT service

Notify listeners of video quality changed event
- Propagate the video quality changed message.

IMS: Add support for video quality
- Add Config interface to get/set video quality

IMS-VT: Change call data usage parameters
Change call data usage methods to take parameter of long type
instead of int

Change-Id: I543aa082337d437ec7c2bf249bafb9658f34dd1b

Propagate the call substate changed message to the UI

Change-Id: I695736ccfa4e4446912ba6c3df1713bae6d4486a
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/internal/ImsCallSession.java
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
25394099999f724f7806cbc7119ecca3708cf3b3 01-Apr-2015 Tyler Gunn <tgunn@google.com> Prevent merging conference calls hosted on peer device.

With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call
is merged into a conference. This not only occurs on the device hosting
the conference call, but also on the devices of the callers merged into
the conference.

This CL adds code to ImsCall to handle changes to the multiparty state of
the session. It also includes code to track whether the ImsCall is the
Conference Host. A call is the conference host if the conference was
established on the current device.



Bug: 19478784
Change-Id: I764d6381d25275980a87705b7b53e21cdbffb1ea
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
61d41c1f9ba249bd0df575cc1b551a9e70f54645 02-Apr-2015 Anthony Lee <anthonylee@google.com> Remove an extraneous check in callSessionMergeFailed().

There is no reason why we cannot continue with merge cleanup
(just to be safe) on a call regardless of if the "i'm in a merge"
flag is set or not. If, for some reason, the call is not
part of a merge, its a NOOP. This handles the case when the
callbacks are out of order and we receive a callSessionMergedFailed()
after a callSessionTerminate() on the merge host. It doesn't really
make sense for the callbacks to come back that way but we should
support it either way. I also cleaned up the processMergeFailed()
function so that it doesn't abort when there is no merge peer.
Now the logic cleans up the merge host anyways and cleans up the
peer only if it exists.
Note that this is only a partial fix for this bug. The other issue
(main issue) that we need to resolve is why the first conference
puts Telecom in a state where the second conference fails.

Bug: 19852295
Change-Id: I3acf8fd4fd5c199c01ca2c4ead4119f3876e38d5
rc/java/com/android/ims/ImsCall.java
6804851b58264d7e82b09a845118d24d36c8d831 18-Mar-2015 Anthony Lee <anthonylee@google.com> Clean up logging for ImsCall to make it easier to debug bugreports.

Moved the logging from the radio log to the system log for a
better chance at seeing something from customer reports.

Bug: 19625417
Change-Id: Ib5ae7275fce0a502ba6a1ad356f32f1010d14198
rc/java/com/android/ims/ImsCall.java
3733c9b7185cf95d57bd9983da05c11548e79d88 31-Mar-2015 Etan Cohen <etancohen@google.com> Merge commit '48738d5f4d5a7dc3611fe9a700e9d5add146b461' into merge
48738d5f4d5a7dc3611fe9a700e9d5add146b461 31-Jan-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: UT ServiceClass

When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I419aca453657063941d2b9121b508a0a69a17e6a
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
163eb4e8388b4835ed5e2f65f5abd17a6e1db9ae 25-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
9e6eca2d0ceef9edc401c66783bca3a57547b727 16-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Force IMS to register over LTE when turning off WFC

Bug: 19697174
Change-Id: I4b1538052f4bc2bf5d7c55f78467c6c52b49efd8
rc/java/com/android/ims/ImsManager.java
bb14f74aaa122714acdd51ce9e8e4192e3fb7e36 17-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Move "IMS registration error" intent from ImsPhone to ImsManager." into lmp-mr1-wfc-dev
46600ed773b84fc63b67fd6d0ff2cc5888d3a7eb 16-Mar-2015 Vinit Deshpande <vinitd@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
7b72dc2e9dacdb51e998775e8505744a574afb12 04-Feb-2015 Rekha Kumar <rekhak@codeaurora.org> IMS: IMS Registration and handover error codes support

- Add support for propagating IMS Registration error codes and error
messages.
- Propagate the call session handover info to the UI
Change-Id: If2f2008734735f52614bd046fee144843a465ecf
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/internal/ImsCallSession.java
4b09bc28eeb32d2576a44eaa2560b42efb82b1bf 24-Feb-2015 Pavel Zhamaitsiak <pavelz@google.com> Decouple WFC from Enhanced 4G LTE in settings

TMo requires WFC and Enhanced 4G LTE mode to be enabled/disabled independently.
IMS used to be stopped when 4G LTE was disabled and started when it was
enabled. Now we need to take WFC into account when making decision about
starting/stopping IMS.

Change-Id: Icc92097a98e07994783b2ec3579d86b05315d0a2
rc/java/com/android/ims/ImsManager.java
f31e6fc36deb4447ff7c2041378dcff9e33865b9 24-Dec-2014 Etan Cohen <etancohen@google.com> WFC configuration: add API to get and set user settings.

Change-Id: Ia6ab8e5941b707d77321059450e6235f27ecbf38
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/ImsManager.java
0c2f15ca06fadf31ba50f0e425395fe2890eeaaa 12-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Move "IMS registration error" intent from ImsPhone to ImsManager.

Change-Id: I2b57fbcf73110b453307a936dd3c8421c51d5030
rc/java/com/android/ims/ImsManager.java
28c84005038e2a15c8c087551034b6714ef574dd 11-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> WiFi Calling: Change default value for the roaming setting to OFF.

Bug 19682545
Change-Id: Ia3fbcc3aba38cc6c5bae180b512a16f02f48f457
rc/java/com/android/ims/ImsManager.java
1463174fa4bab35f04dfa71196c277dfeb603717 04-Feb-2015 Rekha Kumar <rekhak@codeaurora.org> IMS: IMS Registration and handover error codes support

- Add support for propagating IMS Registration error codes and error
messages.
- Propagate the call session handover info to the UI
Change-Id: If2f2008734735f52614bd046fee144843a465ecf
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/internal/ImsCallSession.java
71b788a38f0ce4c43ad1c3f9873493f5235ee81e 03-Mar-2015 Etan Cohen <etancohen@google.com> am f4311129: Add interface to determine whether the IMS service is available

* commit 'f4311129e3508963811d77715f1486ff54964341':
Add interface to determine whether the IMS service is available
183af604fb69ff73a9aeb333c0965221ab380f98 24-Feb-2015 Pavel Zhamaitsiak <pavelz@google.com> Decouple WFC from Enhanced 4G LTE in settings

TMo requires WFC and Enhanced 4G LTE mode to be enabled/disabled independently.
IMS used to be stopped when 4G LTE was disabled and started when it was
enabled. Now we need to take WFC into account when making decision about
starting/stopping IMS.

Change-Id: Icc92097a98e07994783b2ec3579d86b05315d0a2
rc/java/com/android/ims/ImsManager.java
f4311129e3508963811d77715f1486ff54964341 27-Feb-2015 Etan Cohen <etancohen@google.com> Add interface to determine whether the IMS service is available

Bug: 19447972
Change-Id: Ida074dd6840c1c7682bdca32d858aa28db2dc71d
rc/java/com/android/ims/ImsManager.java
a00c919698d1f5db98238994ad53dd223316a949 24-Dec-2014 Etan Cohen <etancohen@google.com> WFC configuration: add API to get and set user settings.

Change-Id: Ia6ab8e5941b707d77321059450e6235f27ecbf38
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/ImsManager.java
c479f66e3d1f3cfdd3e88a050881f7cd663a5a90 12-Feb-2015 Anthony Lee <anthonylee@google.com> Cleanup of conference code including logging, flags and some workflow.

The main purpose was to simply the logic so that the code is more
explicit about what it is doing. There was also a bug in the hold and
resume flow that was fixed.

Bug: 19294176
Change-Id: I558d6da919b9d763f1fd2413e8f9a3dfa5d0e4be
rc/java/com/android/ims/ImsCall.java
165aed55d289ae2a5cdf34de4164c2395f46b8c1 06-Feb-2015 Libin.Tang@motorola.com <w16529@motorola.com> Fixing TMO Conference Call Attempt leaves Dialer App in a Zombie state.

When conference call is failed, the mUpdateRequest of both host and peer
imscalls should be updated to UPDATE_NONE.

Bug: 19285127
Change-Id: Ib4afcbf3223d0f0be856e3686f899ade38235e96
rc/java/com/android/ims/ImsCall.java
047d8101113030f34f89f7c9ba015d6c5c3abba6 31-Jan-2015 Tyler Gunn <tgunn@google.com> Fixing conference merge where only one party is added to conference.

- revisit code to trigger processMergeComplete; we used to assume that we
were done merging when the transient session started. We now have to
check on terminate and on hold to see if all the calls have been

Bug: 18960042
Change-Id: I682303558c6958d85d2358102757608041b8451e
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
b5388a368811eb39ba2f25f1266208b72e62f280 26-Nov-2014 Etan Cohen <etancohen@google.com> Use provisioning (if needed by carrier) to determine whether platform supports VoLTE

Bug: 18576107
Change-Id: I79d0c44a579923cc36fecd2798754cc8a72839c6
rc/java/com/android/ims/ImsManager.java
82f7812ac0250a2c61ce2fd9b7439cdf841ef893 15-Dec-2014 Etan Cohen <etancohen@google.com> Disable VoLTE if TTY is on and TTY is not supported over VoLTE

- VoLTE is disabled if TTY is turned on and it is not supported
over VoLTE.
- Add API indicating whether VoLTE is enabled due to TTY restrictions.
Uses configuration of VoLTE on TTY supported and current TTY mode.
- Move code changing Settings.Global.ENHANCED_4G_MODE_ENABLED
from MobileNetworkSettings activity.

Bug: 18593974
Change-Id: Ib2706cf5f30412a735cc6f24228accc7f1216804
rc/java/com/android/ims/ImsManager.java
a6cae36b881e26fa288a83c94b8c357fd436140e 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> IMS: Notify about change of TTY mode of other call participants

Pass notification to Phone app

Bug: 18247323
Change-Id: I428f8df60ebada280c6aa16debf1ff44246533bd
rc/java/com/android/ims/ImsCall.java
a4710d5d926d8112179acece620f49cb79257e98 09-Dec-2014 Andrew Lee <anwlee@google.com> Pass Message through sendDtmf.

Do not invoke sendToTarget ourselves. Instead, pass the message
through to the ImsCallSession implementation, and rely on that
to send the message to the target.

Bug: 18643493
Change-Id: I37a891ecf71d55b93f24f9b853b64b34a24e0910
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
3fd20025b87ff6828182d21668dd0b7a4a0435ec 31-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: support for OMA-DM based provisioning.

Bug: 18576107
Change-Id: Id16ea5ed3ce0c714f658cc86b66f487199d999a7
rc/java/com/android/ims/ImsConfig.java
6dd039f557a92eb308a94799da95e5fa27bec492 07-Dec-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add an ImsConfig api to get volte provisioned value.

Bug: 18576107
Change-Id: I84c66089291ffb4051ed7ef70d4a2bcf4a24c3d7
rc/java/com/android/ims/ImsConfig.java
a6fbae9f8c793118e008a98d3576df316bf0364a 06-Dec-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: start and stop dtmf tones.

Support of start and stop dtmf tones in Imsphone

Bug: 18371919
Change-Id: I04f5d6f88088e5b77d314d4db9271fd49abf5dca
CRs-Fixed: 751797
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
87466c59b1980ec4e56bb17fae8b855efcc17fd8 08-Dec-2014 Tyler Gunn <tgunn@google.com> Fixing disconnect tone heard when merging 3rd participant into conference.

The issue was when we set the merge peer/merge host. We were always
setting the merge peer to the BG call. This is fine when there is no
conference, but when we already have a conference we need to take into
account whether the FG or BG is the conference.

Bug: 18652342
Change-Id: I910a1bee3d3e04477861ed68f2a77a49d0da8471
rc/java/com/android/ims/ImsCall.java
095839a66699a128c76cd5002459fcba7c3a9a0d 03-Dec-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: Reset mHold flag once call is merged

When Conference call is on HOLD and merged, mHold flag is required
to be reset explicitly as Telephony does not send RESUME request
in this scenario.

Bug: 18625579
Change-Id: Icb0b2b52d7dfe64c456b4e7c1b2e7458640ee1da
rc/java/com/android/ims/ImsCall.java
d40d4a9ca488e4caa07ed7916ccae4b76c385cae 24-Nov-2014 Etan Cohen <etancohen@google.com> Add a global override for VoLTE calls (which leaves user setting in place)

Bug: 18446228
Change-Id: I77e0047d97be6fb4a81e4e25e0404e2cdcb16644
rc/java/com/android/ims/ImsManager.java
6cb99be298f8b1b4363fdacc1cc631c3671380ec 02-Dec-2014 Tyler Gunn <tgunn@google.com> Turning off extended IMS logging (STOPSHIP item).

Bug: 18576223
Change-Id: Ia36750b121836e088ac8f75946bbbe90a5dbdf08
rc/java/com/android/ims/ImsCall.java
c1b4a55f5c1c8e8db8d5243988b3b39c37ca6de6 02-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Cleanup to remove misused CallGroup concept." into lmp-mr1-dev
9bd5ca59239ac4acdccf97c0ab7a2a4ab957bf28 02-Dec-2014 Tyler Gunn <tgunn@google.com> Cleanup to remove misused CallGroup concept.

The ImsCall code makes extensive use of a "CallGroup". This CallGroup has
been the source of a number of bugs, since the CallGroup concept does not
match well with how we are performing merges in IMS.

1. Removed Call Group, replacing with a "peer" and "host" references in
the ImsCall.
2. Revisited the merge logic within the context of the peer/host changes.
3. Also, changed log statements to log the ImsCall instead of the session.
This aids debugging by making it more clear what the context of the various
method operations are.

Bug: 18588383

Change-Id: I78613c44bf656c8ebf9e5d6a1145784ce630deef
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsCallGroup.java
rc/java/com/android/ims/internal/CallGroup.java
rc/java/com/android/ims/internal/CallGroupManager.java
rc/java/com/android/ims/internal/ICallGroup.java
abbd7880cf8e29274dfc0508568fbffe9f49cad7 27-Sep-2014 Etan Cohen <etancohen@google.com> MSIM IMS: convert to phone ID based selection.

Bug: 18576822
Change-Id: I7e1c79fff307a5f433529213ee2670ad58080d91
rc/java/com/android/ims/ImsManager.java
f348775aec349cf205f711352345c8f4e89875de 21-Nov-2014 Ihab Awad <ihab@google.com> Telecom API updates (6/6)

Bug: 18292176
Change-Id: Ie42fb083cf505ff5bd5c13c6424d2606dec494de
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
652ee0ef914be165355b34c903c4cbc95d4f4afc 20-Nov-2014 Andrew Lee <anwlee@google.com> Merge "Track state if ImsCall terminated by merge." into lmp-mr1-dev
8ae59492156d9cef275f559c5ee09a44315989be 18-Nov-2014 Andrew Lee <anwlee@google.com> Track state if ImsCall terminated by merge.

- Save the state if the call when it is merged and there is a
call group of which it is not the owner. We conclude that this
call was merged into the other call group. If the merge fails,
we set this state back to false.
- Delete updateCallGroup, as it is an unused method.
- When a merge occurs, set a call group on the background call if
the referral call's CallGroup is null. Before, when two IMS
connections were first merged into a conference, the call group
was not set on the background call and so pathway through
notifyConferenceSessionTerminated (which checks for mWasMerged)
never occurred.

Bug: 18291234
Change-Id: Ibb981bdeb8e1f8d0fca6fde3845876aba13e93e3
rc/java/com/android/ims/ImsCall.java
987bab859324396c0d1fc00c375f98f3f74c9067 17-Nov-2014 Pavel Zhamaitsiak <pavelz@google.com> TTY over IMS: Notify the user that TTY mode changed in the far device

Bug: 18247323
Change-Id: I9847d947c9d1ee97da0151a7ccfac35aa6a7b9c4
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
168c634eef29f21c73129164207d04b8cce23738 18-Nov-2014 Tyler Gunn <tgunn@google.com> Adding toString methods to IMS classes to aid logging.

Bug: 18200934

Change-Id: Iad06de4e5ba1e343749c5b53efac84cf7c20327a
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
e871989b4d1c6590e7c280cbdd90c75ca82a877e 14-Oct-2014 Shriram Ganesh <sganesh@codeaurora.org> Peer capabilities

Add support for peer capabilities

Change-Id: I3af365caaacb4c3c48f73a54da6e5de6bab321aa
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
49c059220a3df5ea6d4e9ee2fdbdc9556cbbb1b1 05-Nov-2014 Omkar Kolangade <omkark@codeaurora.org> IMS Conference Callback Handling

Adding logic to handle intermediate
and conference callbacks while creating
a conference session as well as adding
a call to an existing conference.

Change-Id: Ib53a8f9408f807a6ce1be6005e1fc911b87598d4
rc/java/com/android/ims/ImsCall.java
172568141a72345cc9e7599930332d4200989931 07-Nov-2014 Tyler Gunn <tgunn@google.com> Merge "Conference event package performance improvement." into lmp-mr1-dev
b8799fe85b9387999f03ce7def6ace59903984a4 04-Nov-2014 Anthony Lee <anthonylee@google.com> Complete implementation of ImsCallSession merge()

This CL implements the rest of the logic around the various callbacks
that are issued from the ImsCallSession to implement the merging of
two calls into a conference.

Bug: 18056632
Change-Id: I183a3b2c49d4192e14813333339440d746febdbf
rc/java/com/android/ims/ImsCall.java
1c46760f9e523312d92e027dfdb52d359d65efe1 04-Nov-2014 Tyler Gunn <tgunn@google.com> Conference event package performance improvement.

- Instead of sending each participant to the telephony conference
controller, all participants are sent at once. This way the conference
only needs to be recalculated once.

Bug: 18057361
Change-Id: I10ac8efef74db75a90d97577bcc95d55b827b28b
rc/java/com/android/ims/ImsCall.java
71382693cbc81b1d131085f52d97879976706f55 30-Oct-2014 Anthony Lee <anthonylee@google.com> Implement plumbing for merge() related callback workflows.

Added support for a transient ImsCallSession that could eventually
turn into the underlying ImsCall when it turns into a newly minted
conference call. Also handled the series of callSessionMergeXXX()
series of call to properly set up the pluming for IMS conferences.

Also cleaned up/added some logging.

Lastly, the prototype for onCallMerged() was changed because, at this
level, there is no sensible value that we could return even
if we wanted to. No one uses this newCall parameter anyways.

Bug: 18056632
Change-Id: Ifd0e23571b8bc928f2fd365df6c2d5d0f9a65b50
rc/java/com/android/ims/ImsCall.java
67a843d7d44c1b3a87644389b33f842df1c08351 30-Oct-2014 Tyler Gunn <tgunn@google.com> Creating connections for conference event package participants.

- Adding code to ImsCall to set the call to multi-party when a conference
event package comes in for test purposes.


Bug: 18057361
Change-Id: I1589cced7a31e09a3442e713eb7a17a96370db9f
rc/java/com/android/ims/ImsCall.java
5965614f5b813f2739722589f84cec69c572b0a2 28-Oct-2014 Tyler Gunn <tgunn@google.com> Communicating participant changes to conference controller.

- Add new callback in ImsCall to handle conference event package data
and pass along conference participant state objects to listeners (this
is ultimately bubbled up to the conference controller).

Bug: 18057361
Change-Id: I773972ea66b0c16806efa890ae62578a744caa0e
rc/java/com/android/ims/ImsCall.java
ea2b5836f86a9fda6730e680f063370b9e3a1ef9 24-Oct-2014 Etan Cohen <etancohen@google.com> Separate VoLTE and VT configuration API.

Change-Id: I3647599c7f5c5f6f567428b3ce962f7162405cfa
rc/java/com/android/ims/ImsManager.java
16b3b36eb554d27f23b05577c6a76a9b989bdbcd 24-Oct-2014 Etan Cohen <etancohen@google.com> Added null check and synchronization on multi-party API.

Change-Id: Ie8ffb647a239b789deeabaf4a0e61418af627f75
rc/java/com/android/ims/ImsCall.java
67b77ed5462382ce8184bb33cdffc0201e36d347 27-Oct-2014 Wink Saville <wink@google.com> Merge "Change subId to int from long" into lmp-mr1-dev
938116f08e88772f6736ddd7aa7541c204538b66 27-Oct-2014 Tyler Gunn <tgunn@google.com> Implement test IMS conference event package harness.

- Change some methods on ImsCall so we can externally fake out the
reception of an ImsConferenceState instance.

Bug: 18119796
Change-Id: I0ed4ddce5d9e11e47f26c4931780e65d6a6b337d
rc/java/com/android/ims/ImsCall.java
3f2b0aaa277545886571cbf90fc90fd5d304e714 24-Oct-2014 Tyler Gunn <tgunn@google.com> IMS call merge call-back changes.

Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.

Bug: 18056632
Change-Id: Id560965722f8651646e6ed5ec158747d1cb5e210
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
650762a1678463336e9f7540e117e3856bed881c 24-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev
1e5a38aa6544b231cd7feb4283b15bc8c12be884 23-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
rc/java/com/android/ims/ImsManager.java
b651fa5c90b6a2388d1bd29e67c768894530802e 22-Oct-2014 Etan Cohen <etancohen@google.com> Separated VoLTE and VT configurations.

Change-Id: I16ebaf2904a4ba6e710f3047bb1144be252b0920
rc/java/com/android/ims/ImsManager.java
725ad373383798c1516348475b1f6304484e031e 22-Oct-2014 Tyler Gunn <tgunn@google.com> Propagating isMultiParty indicator from RIL up into Telephony layer.

- Adding isMultiParty() methods to ImsCall and ImsCallSession.

Bug: 18058253
Change-Id: I6c31dc31ca4dc0556c781388059256e525c37528
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
345fbb2613e3a1985108dc2c42ceabe2711243a6 20-Oct-2014 Pavel Zhamaitsiak <pavelz@google.com> IMS: fix Missed incoming call notification not shown.

Bug: 18012896
Change-Id: If4ff70494c4bd14feb06843bd3be6bb12b449ef5
rc/java/com/android/ims/ImsCall.java
54953c79547a4e2f8e690a021d44f533e190427a 07-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: This patch includes:
1. change setProvisionedValue/setProvisionedStringValue to
return operation result.
2 . add additional IMS config.

Change-Id: I460e50e1066cca1751d5aa3ec37c976a91a23f94
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/ImsManager.java
8a6bf4bced8a37c671411e0f6dfa997c479a5153 10-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:change enhanced 4g setting to store in setting db.

Change-Id: Ib31d9e4c0f4e2e0a2bc908f36e85917a28234f1a
rc/java/com/android/ims/ImsManager.java
31f19e6271e53f7fb359866bd32a8b6a3d47d115 11-Sep-2014 Shriram Ganesh <sganesh@codeaurora.org> IMS: Unsol TTY notification support

Code changes to support UNSOL_TTY_NOTIFICATION handling.

Change-Id: Ic5f308bb3b05a5f88178e725c1c541fc7ca22291
rc/java/com/android/ims/internal/ImsCallSession.java
c403b7bee582ed58bd7ae799b5190393b5f7f536 14-Aug-2014 Shriram Ganesh <sganesh@codeaurora.org> Ims: Send user selected TTY mode to lower layers.

Irrespective of whether TTY device is connected or not
send TTY mode setting to modem whenever user changes it
from settings.

Change-Id: I1b6cf0a68f02da1faf438d89e70591037b9d9651
rc/java/com/android/ims/ImsManager.java
3ddaa6ec08d417d2848775ad3b5b01b865a9c891 11-Sep-2014 Tyler Gunn <tgunn@google.com> Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ibf964b6d88935e7787304954295528f8921c0e21
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
111eecc9845826e985c48133b754e453fb3aca84 11-Sep-2014 Etan Cohen <etancohen@google.com> Added support for VoLTE conference hold and resume.

Bug: 17368957
Change-Id: I0aa1034f24c4860dbf5a2baafc340b89cc41f03a
rc/java/com/android/ims/ImsCall.java
af55a405c3838bbc6ea64de521e66eab57547f22 05-Sep-2014 Etan Cohen <etancohen@google.com> Use device and carrier configuration to determine whether phone supports VoLTE.

Additionally, provide a debug override system property.

Bug: 17365969
Change-Id: I07ebaeddc3f37b41b819d43be221f70f6363000c
rc/java/com/android/ims/ImsManager.java
d43b5302d8edf4df90a28055f043786f542df219 29-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Pick the correct callsession for conference calls

Call requests for confernce calls have to be
triggered on owner call session.

Handle conference call hangup scenario to close all
the connections properly

Bug: 17321414
Change-Id: Ice04b0574c001969b9c12140790a7d1c0aa628a8
rc/java/com/android/ims/ImsCall.java
2f92daf76a66d7d2fe6fb7b1a28fc1b5888a7b7c 24-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: modify sendDtmf to pass char input as the vendor implementation does
the conversion from char to int.

Bug: 17282921
Change-Id: I738e6da09df7b54d1aaef2e644e1dcb63d67dd7b
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/internal/ImsCallSession.java
e229678c0502930303de5dfdb939c0214a67d151 19-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: added implementation for registrationFeatureCapabilityChanged.

Bug: 17182366
Change-Id: I78d89dd6ed1a69a9f1d1ddde929a2a8e25751e92
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsManager.java
45b5f3131eb0fab88ab77e64aa7294742aab3478 20-Aug-2014 Etan Cohen <etancohen@google.com> Added utility functions to obtain VoLTE/VT platform & user configuration.

Bug: 17134661
Change-Id: Icbdc86c05069aa883582678e1be0f1548826d948
rc/java/com/android/ims/ImsManager.java
5b4aa98b59f51ce8eea2c4e39a2bd1c188ac3e26 14-Aug-2014 Etan Cohen <etancohen@google.com> ImsException: include code in exception description

Change-Id: Iba108c437df7af6e828145de553e191e8ba039cf
rc/java/com/android/ims/ImsException.java
a8f37ae37c05ebc16ebfd18299df43a807d64ee7 14-Aug-2014 Etan Cohen <etancohen@google.com> Defined constant for default initial IMS state: set to false

False default is a temporary setting until VZN provisioning is added.

Change-Id: Idd0e5945b4caad862c6750cbaf127a493efe6d90
rc/java/com/android/ims/ImsManager.java
ed7fbd60ee7f2d72d7bdf78718663774f526a1bc 13-Aug-2014 Ihab Awad <ihab@google.com> Final structural tweaks to Telecomm API (7/8)

Bug: 16416927
Bug: 16494880
Change-Id: I572145da40cda2bd9cc20d5277491c99cc66bb95
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
5216bd9de165e7fd1ec9b1caea983ab6ca50784e 13-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:fix wrong logging msg.

Change-Id: I674dacb3365421858791949f50c0904846725119
rc/java/com/android/ims/ImsConfig.java
19604c01257e846c0702f24ea0b8357f19272b20 11-Aug-2014 Etan Cohen <etancohen@google.com> Move IMS configuration constants from packages/apps/Settings to common location

Constants for Enhanced 4G LTE Mode needed in packages/apps/Settings as well as
in other shared code (e.g. GSMPhone, CDMAPhone). Moved to shared (common)
location.

Change-Id: I0a718218f2e75754346e1caafaa4250000706ad6
rc/java/com/android/ims/ImsManager.java
cfc784d17278697e9ce0675acf39d0f1f56e4bea 08-Aug-2014 Etan Cohen <etancohen@google.com> Add function to enable/disable "advanced 4G features"

Perform needed configuration settings and IMS turn on/off.

Some carriers may allow disabling of specific IMS features (e.g. VoLTE)
but require that the IMS service itself is never "turned off". Add code
to use configuration bool (which can be overlayed) to control actual
turnOffIms() function execution.

Change-Id: I3cc0fef1426a31924ff5d5cd4516972bcfae040d
rc/java/com/android/ims/ImsManager.java
01b4ea445b5cdc6c1b32153d4f0216f429ede8af 08-Aug-2014 Andrew Lee <anwlee@google.com> Implement Ims's VideoCallProvider, including a wrapper.

+ Implements ConnectionService.VideoCallProvider as
ImsVideoCallProviderWrapper. ConnectionService treats this as
the concrete implementation of VideoCallProvider. In detail though,
it is a wrapper around ImsVideoCallProvider which should be extended
in ImsService and implements the actual video call provider
functionality. This wrapper intermediates communication for commands
sent through Telephony and carried out in ImsService. It also
implements the callback class whose binder is provided to the
ImsVideoCallProvider.
+ ImsVideoCallProvider is an abstract class which defines
functionality which satisfies ConnectionService.VideoCallProvider.
We don't directly extend VideoCallProvider because of the
inter-process communication necessary across Telephony and
ImsService. This class provides a binder which is passed to the
ImsVideoCallProviderWrapper.
+ Implement getVideoCallProvider on ImsCallSession.

Bug: 16886403
Change-Id: I9b995baa74149b3c046789f797ab0ff49ae7165b
rc/java/com/android/ims/internal/ImsCallSession.java
rc/java/com/android/ims/internal/ImsVideoCallProvider.java
rc/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
f54a9cc3d97915245086cdbf32cc2fbe8bfaea8c 09-Jul-2014 Shriram Ganesh <sganesh@codeaurora.org> IMS Framework Changes to Support Call Barring & String Error Codes

ImsUt and ImsUtInterface are being modified for
supporting call barring and propagation of string
error codes from the Ims Service layer.

Change-Id: I66fdbbd175c13261c283627999f37071259f7a6a
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
f398093ec531d9cbb063a23ebfd1f16578157e51 05-Aug-2014 Etan Cohen <etancohen@google.com> Default implementations for IMS session handover callbacks

Change-Id: I863fb0b268315821fa1a0a3246ca60323e9f7585
rc/java/com/android/ims/internal/ImsCallSession.java
4f2161d99a69051145f2a5c843b13441f5226afa 01-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Add ECBM functionality for IMS

Code for adding ECBM functionality for IMS.

Change-Id: I2833c81baf0a55a18ac6433c47fd76bad7cf0ec9
rc/java/com/android/ims/ImsEcbm.java
rc/java/com/android/ims/ImsEcbmStateListener.java
rc/java/com/android/ims/ImsManager.java
0c9c09e19840dcfe8048757ad27a2405c954f372 25-Jul-2014 Etan Cohen <etancohen@google.com> Make sure IMS service is created before calling on/off APIs.

Change-Id: I5ab50e570d06865b3b12a65454c0d4b2803c4ffc
rc/java/com/android/ims/ImsManager.java
7da5a11accec318cc3da2087fb3a891db4f661f7 16-Jul-2014 ram <ram.pl@samsung.com> IMS: Added ims on/off changes & callbacks for features enabled.

Change-Id: Ie2ea119086d7beaee38f39881d3987b87b7a11ea
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/ImsManager.java
d1edfd8cf9ffeb191a84e08522bb570cd8cd4381 18-Jul-2014 Tyler Gunn <tgunn@google.com> Various IMS changes. (2/3)

- Modifying "accept" in ImsCall to pass along the accepted call type.

Bug: 15893156
Change-Id: Ie4f171b56d7026b2620f81cd4075b8d0c0e98abe
rc/java/com/android/ims/ImsCall.java
d772746bfbbd8391376928d71235edde4505ea0a 12-Jul-2014 Etan Cohen <etancohen@google.com> MSIM support for IMS

Added support to handle IMS in MSIM scenarios. Supports an ImsService interface per
subscription.

Note: These individual ImsService interfaces can be implemented on a single or multiple
IMS stacks.

Change-Id: I6d4ce7dd1cc6f75f89a41951ef8fce78afde811c
rc/java/com/android/ims/ImsManager.java
076c55df56906453aade4a741b435f1df72778a2 24-Jun-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: Add Config interface to get/set IMS service/capabilities

Change-Id: I5f422aae105cbf8e85aee711aaa49b5d2e958573
rc/java/com/android/ims/ImsConfig.java
rc/java/com/android/ims/ImsManager.java
5b8b2ec01e90783c8f606fdbc59413c61b9130bf 02-Jul-2014 Brian Carlstrom <bdc@google.com> Add CleanSpec for IImsUt.aidl move to frameworks/base

Change-Id: I5277275687849c7aeca7204d839f00fccf16a885
leanSpec.mk
9b4ca89882b8b403b36462972b826ac9199a34a4 01-Jul-2014 Etan Cohen <etancohen@google.com> IMS Framework and AIDL Changes to Support CLIR/P and COLR/P

Change-Id: I7d15b092feb8fa0eaf6764223d5890ed17c3a143
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
ca45f58a57eb782153c034ae067f59c0018799ca 19-May-2014 Uma Maheswari Ramalingam <uramalin@quicinc.com> Skip hold request for Conference operation

Currently for conference operation, apps
sends out hold request followed by merge.

Certain IMS service implementation will execute
merge operation without waiting for apps to
put the call on hold explicitly.
For these scenarios, block hold request based on the
config value.

Change-Id: I1aec0f95381d43b3f7f1704fce988f0796839c36
rc/java/com/android/ims/ImsCall.java
5f0467a8b9b8aaa7a3d78d7b593f1961e9c59947 26-Jun-2014 Wink Saville <wink@google.com> Fix lpdk build.

Move aidl files from frameworks/opt/net/ims to frameworks/base so lpdk
compiles. The reason is lpdk doesn't have frameworks/base sources so
references to Pending and Bundle in aidl files breaks the pdk build.

I had to move all of them and the ims/*java files for dependency reasons.

Change-Id: I92452562591b157cecdfc01bcd892c4f35f5965c
ndroid.mk
leanSpec.mk
rc/java/com/android/ims/ImsCallForwardInfo.aidl
rc/java/com/android/ims/ImsCallForwardInfo.java
rc/java/com/android/ims/ImsCallProfile.aidl
rc/java/com/android/ims/ImsCallProfile.java
rc/java/com/android/ims/ImsConferenceState.aidl
rc/java/com/android/ims/ImsConferenceState.java
rc/java/com/android/ims/ImsReasonInfo.aidl
rc/java/com/android/ims/ImsReasonInfo.java
rc/java/com/android/ims/ImsSsInfo.aidl
rc/java/com/android/ims/ImsSsInfo.java
rc/java/com/android/ims/ImsStreamMediaProfile.aidl
rc/java/com/android/ims/ImsStreamMediaProfile.java
rc/java/com/android/ims/internal/IImsCallSession.aidl
rc/java/com/android/ims/internal/IImsCallSessionListener.aidl
rc/java/com/android/ims/internal/IImsRegistrationListener.aidl
rc/java/com/android/ims/internal/IImsService.aidl
rc/java/com/android/ims/internal/IImsStreamMediaSession.aidl
rc/java/com/android/ims/internal/IImsUt.aidl
rc/java/com/android/ims/internal/IImsUtListener.aidl
ef36ef67e009449300b0150c60c9f637e205d79e 11-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
ndroid.mk
leanSpec.mk
EADME.txt
rc/java/com/android/ims/ImsCall.java
rc/java/com/android/ims/ImsCallForwardInfo.aidl
rc/java/com/android/ims/ImsCallForwardInfo.java
rc/java/com/android/ims/ImsCallGroup.java
rc/java/com/android/ims/ImsCallProfile.aidl
rc/java/com/android/ims/ImsCallProfile.java
rc/java/com/android/ims/ImsConferenceState.aidl
rc/java/com/android/ims/ImsConferenceState.java
rc/java/com/android/ims/ImsConnectionStateListener.java
rc/java/com/android/ims/ImsException.java
rc/java/com/android/ims/ImsManager.java
rc/java/com/android/ims/ImsReasonInfo.aidl
rc/java/com/android/ims/ImsReasonInfo.java
rc/java/com/android/ims/ImsServiceClass.java
rc/java/com/android/ims/ImsSsInfo.aidl
rc/java/com/android/ims/ImsSsInfo.java
rc/java/com/android/ims/ImsStreamMediaProfile.aidl
rc/java/com/android/ims/ImsStreamMediaProfile.java
rc/java/com/android/ims/ImsUt.java
rc/java/com/android/ims/ImsUtInterface.java
rc/java/com/android/ims/internal/CallGroup.java
rc/java/com/android/ims/internal/CallGroupManager.java
rc/java/com/android/ims/internal/ICall.java
rc/java/com/android/ims/internal/ICallGroup.java
rc/java/com/android/ims/internal/IImsCallSession.aidl
rc/java/com/android/ims/internal/IImsCallSessionListener.aidl
rc/java/com/android/ims/internal/IImsRegistrationListener.aidl
rc/java/com/android/ims/internal/IImsService.aidl
rc/java/com/android/ims/internal/IImsStreamMediaSession.aidl
rc/java/com/android/ims/internal/IImsUt.aidl
rc/java/com/android/ims/internal/IImsUtListener.aidl
rc/java/com/android/ims/internal/ImsCallSession.java
rc/java/com/android/ims/internal/ImsStreamMediaSession.java
7a655848f691c0d27421b293f96782a1bd5fb081 25-Nov-2013 Geoff Mendal <mendal@google.com> Initial empty repository