aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-11Snap for 8817865 from bd325fc0efd8f104f93e04969abd53e198df2d5f to ↵aml_go_med_330913000android13-mainline-go-media-releaseAndroid Build Coastguard Worker
mainline-go-media-release Change-Id: I1edc742bcbb7624df10ec18ed00978a1c0a3ae4f
2022-06-17Fix RTT NPE due to ImsCall#close being called am: fff67ce3fcBrad Ebinger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18973189 Change-Id: I4db9c51f28c51441ebac0256ea247c2691b9a6cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17Fix RTT NPE due to ImsCall#close being calledandroid13-devBrad Ebinger
When the IMS call is closed, in some cases, a pending RTT initialization request could still be in the queue to be processed. Since this depends on resources that have since been release, it can cause an NPE. Guard against this condition and return early if this condition is hit. Bug: 236279778 Test: atest FrameworksTelephonyTests:ImsCallTest Change-Id: I1c734eebd8135655752e646c5967e65cfe140c89
2022-06-16Snap for 8736029 from 61f29dc898b7a7aa6020bf6d10e60381978158dc to ↵Android Build Coastguard Worker
mainline-go-media-release Change-Id: I98c17b62addc36c0d59e4dcd035675a0835a9975
2022-06-16Snap for 8735767 from 2838d3908eecbc55c57076c142ac1c204f2761f9 to ↵Android Build Coastguard Worker
mainline-go-media-release Change-Id: I082b3d4c030d5513a0447338bcc45ef851043587
2022-06-10Fix shouldProcessCall in ImsManager am: 2838d3908eChinmay Dhodapkar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18839007 Change-Id: I3f2a5ec3da9f8fab3a4c93d9dd12ac2e4da8b5b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Fix shouldProcessCall in ImsManagerChinmay Dhodapkar
There can be call attempts made before the ims service is initialized. In this case, shouldProcessCall should throw an exception, else it might result in subsequent call failure in IMS. Bug: 232514463 Test: atest ImsManagerTest Change-Id: I81a25250a65bf6af0910c57f093ebbc71bad1dba (cherry picked from commit 7b6fb80d5ec80d4ef996453f16403727d17ff279)
2022-06-03Snap for 8680285 from d342f0b2901e81723e4d4d0c1f613c65dc791d6f to ↵Android Build Coastguard Worker
mainline-go-media-release Change-Id: I7691dd57c2bee206ae77b116689fa97b8f6f6307
2022-05-25update to handle IllegalArgumentException am: d342f0b290joonhunshin
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18485568 Change-Id: I7795e92d43a74b96b9e84e2d651405ab842f05bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23update to handle IllegalArgumentExceptionjoonhunshin
ImaManager used ImsProvisioningController. When the subId is not valid, ImsProvisioningController throws IllegalArgumentException. Exception handling code updated for ImsManager. Bug: 233114326 Test: atest ImsManagerTest Change-Id: I634ff650ce1d144bcc19952d99a57140be00056f
2022-05-20Snap for 8620235 from 6f7c9bb60a9f80673649044c18863d8ce155ff61 to ↵Android Build Coastguard Worker
mainline-go-media-release Change-Id: I7718b0d3d5ff66a10e7e0cf927ba8c916f00607c
2022-05-07Fix a minor logic issue in ag/18176102 am: 6f7c9bb60aBrad Ebinger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18203222 Change-Id: I66945139426c26833ab62b9c4b6b819c1b827792 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07add use_tel_uri_for_pidf_xml field for ATT-UCE 430 am: cac5e22110Hyunho
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18176102 Change-Id: Iaaa2ef96bf5620dfc0f418744cfc717432627e2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Fix a minor logic issue in ag/18176102Brad Ebinger
Bug: b/229669620 Test: atest ImsCommonTests; confirmed PUBLISH 200 OK on TMO Change-Id: I5399b58a14e3522697d9be4a8fb92aebee6d5b5b
2022-05-06add use_tel_uri_for_pidf_xml field for ATT-UCE 430Hyunho
Add use_tel_uri_for_pidf_xml field for ATT-UCE 430 Set the added filed to false by defaut and true for ATT If the field is true, get the first TEL URI from associated uris. Bug: b/229669620 Test: PUBLSIH-200 OK in live network Test: Forcibly set tel and sip uri to assocoated uri and change the field value to see if the desired URI is obtained. Test: atest DeviceCapabilityInfoTest Merged-In: I64537994418beb37c7a05c206cebe5bbc9fcb8f5 Change-Id: I64537994418beb37c7a05c206cebe5bbc9fcb8f5
2022-05-04Merge "ImsProvisioningController returns provisioned when provisoning has ↵Joonhun Shin
not completed" into tm-dev am: a19e683c8b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18032083 Change-Id: Ib9592659499f3682b624eb1130848a67914dfe6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to ↵Joonhun Shin
check if the EAB provisioned." into tm-dev am: 8ccae76735 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17864693 Change-Id: Ib2e56eb1b4ef709e959242f12d1619a42c65ae3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "ImsProvisioningController returns provisioned when provisoning has ↵Joonhun Shin
not completed" into tm-dev
2022-05-04Merge "Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to ↵Joonhun Shin
check if the EAB provisioned." into tm-dev
2022-05-02ImsProvisioningController returns provisioned when provisoning has not completedjoonhunshin
Delete code that access deprecated carrier config key, and hand over to ImsProvisioningController Bug: 230794289 Test: atest ImsManagerTest, ImsServiceTest Test: manual with TMO, ATT SIM 1. add carrier config carrier_volte_provisioning_required_bool as true 2. device reboot 3. check IMS registration and imsprovisioningstatus_X.xml file is created by ImsProvisioningLoader Change-Id: I289e0787ab90957a5c5eb03b4bff9b0ee35160d6
2022-04-28Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Bug: 229793066 Test: atest ImsService, ImsCommonTests Test: manual test with TMO, PUBLISH OK Change-Id: Idb70802ba524807fc298e4d47a82cbe6d44dff1c
2022-04-27Snap for 8505378 from 3ef0e8357e9fc8558a75819e62feca528e1b59eb to ↵Android Build Coastguard Worker
mainline-go-media-release Change-Id: I21b10f4289292e083219bca3c870332497251892
2022-04-25Merge "Add state for 480,486,500,503,603 responses of PUBLISH" into tm-dev ↵Brad Ebinger
am: 3ef0e8357e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17887066 Change-Id: Ibc52ca7ad0d03df77a1491f8b4bd9d5b6c820aa6 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25Merge "Add state for 480,486,500,503,603 responses of PUBLISH" into tm-devBrad Ebinger
2022-04-22(Increasing logging) Adding a new case for IllegalStateException am: eb40db77e8virkumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17908709 Change-Id: I079641ca5d9e8c8012ac8be4d6fdc989e8d113e9 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22(Increasing logging) Adding a new case for IllegalStateExceptionvirkumar
Handle IllegalStateException for increasing logging incase such excpetion occures. Test: atest CtsTelephonyTestCases:ImsCallingTest Bug: 229756822 Merged-In: Iea42ae7c41eb424978bf4390aa8cea63fbd81fce Change-Id: Iea42ae7c41eb424978bf4390aa8cea63fbd81fce (cherry picked from commit 4bacd9b15a36491fd5727c836258de19905c6ae7)
2022-04-21Add the break statement between vt_provisioning_status and ↵Hyunho
rcs_publish_source_throttle_ms am: 07709d2168 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17864691 Change-Id: I39ff86cdcf36f8d55cb05a566792b46e21dca3aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Add state for 480,486,500,503,603 responses of PUBLISHHyunho
Upon receiving 480,486,500,503,603 responses to PUBLISH, the device state set to re_try. If the device state is retry, the PUBLISH requests should be blocked until the vendor called CapabilityExchangeEventListener#onPublishUpdated or CapabilityExchangeEventListener#onRequestPublishCapabilities. Test: atest PublishControllerImplTest CapabilityRequestTest UceControllerTest Bug: b/228781651 Change-Id: I0a4d41a885ff3d212f1d003602b83ccf5ed0a430
2022-04-21Add the break statement between vt_provisioning_status and ↵Hyunho
rcs_publish_source_throttle_ms This is to prevent an accident in which an incorrect value is set. Bug: b/229396800 Test: Build pass Change-Id: I283bcadb6bf1e91635d4052a1e67cc0bcb8db56d
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7d23c17265 -s ours am: 26275df425 -s ours am: e75cf2a251 -s ours am skip reason: Merged-In I43665589e735023de9c8d3d3138e23d094910c19 with SHA-1 3195dc704d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17805505 Change-Id: I6c4060e16dc167d82cea1f685e313f28d922f757 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7d23c17265 -s ours am: 26275df425 -s ours am skip reason: Merged-In I43665589e735023de9c8d3d3138e23d094910c19 with SHA-1 3195dc704d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17805505 Change-Id: Iaf352e7f354854a72a52b40f5ce125f75aa2fa4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7d23c17265 -s ours am skip reason: Merged-In I43665589e735023de9c8d3d3138e23d094910c19 with SHA-1 3195dc704d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17805505 Change-Id: I62f8baee8a4b3a7631c678a7b0f2dc49c9c6a8e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: I43665589e735023de9c8d3d3138e23d094910c19 Change-Id: I8904f322fd5ec1772942d95324397e7ec4bfae88
2022-04-14[automerger skipped] Merge "Even though the state of the ImsFeature is set ↵Hyosun Kim
to STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36d4 am: fe94689e8c am: f5d90cd662 -s ours am: 42b6ca6a29 -s ours am skip reason: Merged-In Ie5fdc093701a6a1602372a80125629e96d7775bf with SHA-1 6d19fa7df2 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547 Change-Id: Ibd2a1f85e263589b9f686f7c340aee2adce0740d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "After saving the capability information in the EAB DB, the invalid ↵Hyunho Shin
data is immediately deleted from the EAB DB." am: d9f22e0d8f am: 4f956cc5a8 am: 148dbf8421 am: 0f98277028 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058852 Change-Id: I97b6e5216d325b00bc6e7c49cbbdfc0ed9293174 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14[automerger skipped] Merge "Even though the state of the ImsFeature is set ↵Hyosun Kim
to STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36d4 am: fe94689e8c am: f5d90cd662 -s ours am skip reason: Merged-In Ie5fdc093701a6a1602372a80125629e96d7775bf with SHA-1 6d19fa7df2 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547 Change-Id: If19cdae48dfd020fab99035c01e49e5216da27d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "After saving the capability information in the EAB DB, the invalid ↵Hyunho Shin
data is immediately deleted from the EAB DB." am: d9f22e0d8f am: 4f956cc5a8 am: 148dbf8421 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058852 Change-Id: Iab71d55369cd795fef825a06a860af32abee2b2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, ↵Hyosun Kim
fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36d4 am: fe94689e8c Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547 Change-Id: I1600d8b831037aab532f93c6ff1fc1147a9d6264 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "After saving the capability information in the EAB DB, the invalid ↵Hyunho Shin
data is immediately deleted from the EAB DB." am: d9f22e0d8f am: 4f956cc5a8 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058852 Change-Id: I35077db1c45fe723d54438d31dd4b8e0145e303d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, ↵Hyosun Kim
fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36d4 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547 Change-Id: Ifd0c0851616a3ae8e7adcbb1d4d487805a2f6f9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "After saving the capability information in the EAB DB, the invalid ↵Hyunho Shin
data is immediately deleted from the EAB DB." am: d9f22e0d8f Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058852 Change-Id: I526519dbc7f46735bd481a974666e3e701a6b3eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, ↵Hyosun Kim
fixed CapabilityCallbackManager#unregisterCallback to complete successfully."
2022-04-13Merge "After saving the capability information in the EAB DB, the invalid ↵Hyunho Shin
data is immediately deleted from the EAB DB."
2022-04-13Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, ↵Hyosun Kim
fixed CapabilityCallbackManager#unregisterCallback to complete successfully." into tm-dev am: d0b577941c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17693429 Change-Id: I35c3fca40f22c177b4e64a2804c3bd0cf2e4fe42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, fixed ↵hyosun
CapabilityCallbackManager#unregisterCallback to complete successfully. Change CapabilityCallbackManager#unregisterCallback to use #isBinderAlive instead of using #checkServiceIsReady. Bug: 225259107 Test: atest ImsCommonTests Change-Id: Ie5fdc093701a6a1602372a80125629e96d7775bf Merged-In: Ie5fdc093701a6a1602372a80125629e96d7775bf
2022-04-13Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, ↵Hyosun Kim
fixed CapabilityCallbackManager#unregisterCallback to complete successfully." into tm-dev
2022-04-12[automerge] Even though the state of the ImsFeature is set to ↵Presubmit Automerger Backend
STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully. 2p: 6d19fa7df2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17693429 Bug: 225259107 Change-Id: Ia331cbe3d79e0db77d8057733875935af99e7e63
2022-04-12Merge "Do not delete the DB if the received document is malformed/corrupt" ↵Hyunho Shin
am: 3263fd22ef am: 0b25267de2 am: 921b824036 am: 6340dacb4e Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058847 Change-Id: Ib67273c4daf825e09d63ce6888c670245049c3ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Do not delete the DB if the received document is malformed/corrupt" ↵Hyunho Shin
am: 3263fd22ef am: 0b25267de2 am: 921b824036 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058847 Change-Id: I78ebefcc9217ebb846bea59c264d4575bffb4eff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Do not delete the DB if the received document is malformed/corrupt" ↵Hyunho Shin
am: 3263fd22ef am: 0b25267de2 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058847 Change-Id: Id70b79cbfbf5ed75098a9f564d763bf31d130984 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>