aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-10Snap for 9470583 from de8e8c98463a5c1892970f20d4612a0bb7754ba0 to ↵android-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseAndroid Build Coastguard Worker
tm-qpr3-release Change-Id: Ib008f408678fda50c53187c034343bbd9d85248c
2022-10-28Remove airplane mode handling code.android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseHyunho
In VZW TC 3.18, the device did not need to send a PUBLISH when a 412 response was received for a UN PUBLISH request. Turn on airplane mode for testing. As a result, the device sends a UN PUBLISH request. However, since airplane mode has changed, the Framework sends a PUBLISH request to the ImsService. So this case failed. Bug: b/243137045 Test: Turn on airplane mode > deice sends a UN PUBLISH request > Not handle airplane mode change event in the publish controller. Test: atest DeviceCapabilityListenerTest Change-Id: Id96bd4a233e9208865afaa9c3fe0cccb239bad93 Merged-In: Id96bd4a233e9208865afaa9c3fe0cccb239bad93 (cherry picked from commit b4a75a44ff977b0e9bfb215cdde502901ca36d6c)
2022-06-21Add MODIFY_PHONE_STATE when registering receiverChinmay Dhodapkar
Without this additional check we can end up handling ACTION_TTY_PREFERRED_MODE_CHANGE from an unpriviledged app Currently this intent is sent by dialer on 1P devices, so it cannot be converted to a protected-broadcast Bug: 236264289 Tests: atest DeviceCapabilityListenerTest Change-Id: I221b28dd3e1f7ed51f915dc79a62f8818f8a65a2
2022-06-17Fix RTT NPE due to ImsCall#close being called am: fff67ce3fc am: d8d83258d6Brad Ebinger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18973189 Change-Id: Ifb0626828cdcdc4287ebdfeb8efd9d78cc8932ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: Ib3e8c0f7d85c6b82b0a395468f38b584afe1a942 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-10Fix shouldProcessCall in ImsManager am: 2838d3908e am: 3c6ae79d75Chinmay Dhodapkar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18839007 Change-Id: I4a451267f39f54aca590a8ea47b401f6cf7cba7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: I8afbe8216a5a6175bff355faaeec11a461d28e85 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-05-25update to handle IllegalArgumentException am: d342f0b290 am: cd9e3dd281joonhunshin
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18485568 Change-Id: I13c0a696df1eeb43271c43c94bce37924b3e0679 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: Id9f6cecc142cb4f1f064e7eeab9e8305e025aa23 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-07Fix a minor logic issue in ag/18176102 am: 6f7c9bb60a am: 04dfd01b0bBrad Ebinger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18203222 Change-Id: I657c7c573e9d3fcb879a38731137fa1d15c9eb33 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: cac5e22110 am: e7393c8dc4Hyunho
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18176102 Change-Id: Id5cf8697a1cefda429faa8b0595976035d20755e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: I48e85e8f4d32a9af54bf4603ee19aba7f3d788ab 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: I9c6100977a35918904c49d801e255b537510cf4b 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 am: dacf53ff8c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18032083 Change-Id: I1df9e59c9f2245a6f01cecad9f0b060e6ebf246b 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 am: 8779a62285 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17864693 Change-Id: Idee726ac87006f493ecad5e211dc261131f1dabb 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 am: a19e683c8b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18032083 Change-Id: I885424b2c63dcdd502e485b3791dcf8ab80f7b5a 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: I68fc0ca9b4bf6cf7a216699ba2b3a29fbf5f3721 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-25Merge "Add state for 480,486,500,503,603 responses of PUBLISH" into tm-dev ↵Brad Ebinger
am: 3ef0e8357e am: 3c0127ed29 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17887066 Change-Id: I389a5cea51085a449a8b60fdeb5b51c9b2d24a17 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-dev ↵Brad Ebinger
am: 3ef0e8357e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17887066 Change-Id: I7a9e2585542f3dd64ecd5f4a6e1e276656b33ca6 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: ↵virkumar
eb40db77e8 am: 3d47984fe2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17908709 Change-Id: I1610ac3878fa742c26582fd793014dc8f5890ccf 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 IllegalStateException am: eb40db77e8virkumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17908709 Change-Id: Id831fbec7a5083dd5c44a08b78f8e673492648c8 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-22Add the break statement between vt_provisioning_status and ↵Hyunho
rcs_publish_source_throttle_ms am: 07709d2168 am: dd1936a292 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/17864691 Change-Id: I083d8ad6cff63a23106f4e90201ebefd2ead1400 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: I186c4d867e79e33c36bc49915c2e088cf8b8461e 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: d5bcd306d8 -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: I5a2287a5323a985a5c061e5afd403bad42e0c4d8 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: 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: I87cb07f23c52f50a0658a91b09d6e20bb5116e66 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: 1e61b6521f -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: I0eaef9bc0e8844b3ee0fdc036d7510d14bfc41d1 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 am: ff9ff010d6 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2058852 Change-Id: Id722af3d673721ba0b6a59c545a8f37d93584bf4 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: 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: I1d185bcf7e0c2aa077841fa15e338853a4f22bd4 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: If4ce951c25693649e824f00ccecb2dc48438ba95 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>