aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
6 daysRemove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()HEADmastermainJeff DeCew
Test: atest Bug: 336802415 Flag: test_only Merged-In: Ic2cfdbb292daf12d19ab565e684d7cc8295e52f3 Change-Id: Ic2cfdbb292daf12d19ab565e684d7cc8295e52f3
2024-03-09Enable use of error prone annotationsShai Barack
This is required for ag/26422309 Bug: 327646201 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8cf3a10c33866ece91f4d6b8b4fcfcb2f15ff554) Merged-In: I57812da36aa7b1773c944971decb4afca671ba05 Change-Id: I57812da36aa7b1773c944971decb4afca671ba05
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Idd1de858977ebc2176d22c48c279d87a37002686 Change-Id: I54fbef19d22c4faf3c2bff4ff18e60acebf40d08
2024-03-04Add Jaya to fw/opt/net/ims OWNERS am: 3b982e1669temp_319669529Brad Ebinger
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2987409 Change-Id: Idd1de858977ebc2176d22c48c279d87a37002686 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-04Add Jaya to fw/opt/net/ims OWNERSBrad Ebinger
Change-Id: Ibeba757d4fa74b22c8fa887213199e6708bc3629
2024-02-13Migrate Test Targets to New Android Ownership Model am: 803995faa5Aditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2946291 Change-Id: I789ac68f3fe7d5f45bad5e753c0473eeb7ba42a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Iad1e02524b99a044eb9a1828092a969078205acd
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I874715e2e0843427fbefe33343fbe2ab2b22dd9c Change-Id: I2a231ba9b6917dca40119ccfe93249abf719d3cc
2023-10-25Throw the ImsException when registering listener failedjoonhunshin
If registering listener failed, set session closed flag to block other operations. Bug: 289461637 Bug: 304441595 Test: atest ImsManagerTest Test: received test result from partner Change-Id: I874715e2e0843427fbefe33343fbe2ab2b22dd9c
2023-10-07[automerger skipped] Merge Android 14 am: b502ecb835 -s ours am: a180a0f964 ↵Xin Li
-s ours am: 6472beda1b -s ours am: 12ce5ee127 -s ours am: 988956248a -s ours am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: I7acbac298f6489360e48d7c6f1ac095638fd1e00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b502ecb835 -s ours am: a180a0f964 ↵Xin Li
-s ours am: 6472beda1b -s ours am: 12ce5ee127 -s ours am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: I7a54c99ab76de6a311d381e64f0147b7bf6b0983 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b502ecb835 -s ours am: a180a0f964 ↵Xin Li
-s ours am: 6472beda1b -s ours am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: I2f7f3199df009ff4bcbe3338236057f436b14a2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b502ecb835 -s ours am: a180a0f964 ↵Xin Li
-s ours am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: Id691a4f3c1515de423d5375ab5e34f79a17bc747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b502ecb835 -s oursXin Li
am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: I96d263e4d66837569a17e07cfed4ad8e5f896dfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f Change-Id: I99f24e06b0b55d0f72eb8868f001cd3712f4a573
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9e5 -s ours ↵Xin Li
am: d6b8de917e -s ours am: acd9e70de9 -s ours am: c649d78154 -s ours am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f332 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/24182575 Change-Id: I519e34abb40c73f67a3485ecda13fcc7ea61d1a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9e5 -s ours ↵Xin Li
am: d6b8de917e -s ours am: acd9e70de9 -s ours am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f332 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/24182575 Change-Id: I6a6884a5438ce764c8ea122313deb701cb8ce932 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9e5 -s ours ↵Xin Li
am: d6b8de917e -s ours am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f332 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/24182575 Change-Id: I3902d20b51cb9d5f7ef06185c888ccd4fe71d770 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9e5 -s oursXin Li
am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f332 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/24182575 Change-Id: Ic4c65bf3e5eccb2565426c09fbd34a8437ffa0fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I55980714b5fa0013137f9d39b72b08d068f4b245 Change-Id: I7d2257f8205d89aedf04bf4482ecb11e1239ad6c
2023-08-18Update team owners. am: 02b6851b7f am: 0f60708ead am: 31afae1797 am: ↵Tyler Gunn
7de18bba17 am: f326a92b4a Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2716453 Change-Id: I9041b00d8a1ace65c3c63896f5ecb6c724223200 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18Update team owners. am: 02b6851b7f am: 0f60708ead am: 31afae1797 am: 7de18bba17Tyler Gunn
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2716453 Change-Id: If0f6416ba637402b34f86917a99e4af73811f450 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18Update team owners. am: 02b6851b7f am: 0f60708ead am: 31afae1797Tyler Gunn
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2716453 Change-Id: I2f050972e6c752eef0136e3ae55b1fb89806098a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Update team owners. am: 02b6851b7f am: 0f60708eadTyler Gunn
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2716453 Change-Id: Ibcbfc5684bd9821262431d5b5af14957f4a3b325 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Update team owners. am: 02b6851b7fTyler Gunn
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2716453 Change-Id: I56032f1372d3a7a3846300ecec123a32a7c1de3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Update team owners.Tyler Gunn
Change-Id: I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f Test: Owners only change. Bug: 296459098
2023-08-10[automerger skipped] Merge "Fix, DeviceCapabilityListener does not try to ↵Joonhun Shin
register IMS registration callback." into main am: 472c5ca360 am: 37dcd44a2b am: 15e5f98492 am: 3464c35d26 am: d859f7db05 -s ours am skip reason: Merged-In I5010adfb3e1ce2880cb8f816f021c44257d9c521 with SHA-1 22504ae67a is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2700114 Change-Id: Iee8063c03b9c6fc8d48ada9edc907aaf7365b8f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main am: 472c5ca360 am: 37dcd44a2b am: 15e5f98492 am: 3464c35d26 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2700114 Change-Id: I680e80cc248f820f3362ac00df5f7150bb9732f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main am: 472c5ca360 am: 37dcd44a2b am: 15e5f98492 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2700114 Change-Id: Iac55ffaab24017324150c6bf9b2045675bd786e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main am: 472c5ca360 am: 37dcd44a2b Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2700114 Change-Id: Ib75270b7828b06eadb49bfa1b69c4353d03cc29d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main am: 472c5ca360 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2700114 Change-Id: Ibe734c50544287c132658a127b157de05d96fecb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main
2023-08-09Fix, DeviceCapabilityListener does not try to register IMS registration ↵joonhunshin
callback. When IImsFeatureStatusCallback#notifyImsFeatureStatus() calls with unavailable and ready within short time, the PublishControllerImpl's handler calls DeviceCapabilityListener#onRcsConnected and #onRcsDisconnected consecutively. During this time the DeviceCapabilityListener keeps EVENT_UNREGISTER_IMS_CHANGE and EVENT_REGISTER_IMS_CONTENT_CHANGE messages in Q. When the DeviceCapabilityListener handles EVENT_UNREGISTER_IMS_CHANGE message, it removes EVENT_REGISTER_IMS_CONTENT_CHANGE from Q. By deleting EVENT_REGISTER_IMS_CONTENT_CHANGE, the DeviceCapabilityListener does not try to register the IMS registration callback. Bug: 287833083 Test: atest DeviceCapabilityListenerTest, RcsUceAdapterTest Test: AT&T and TMO live network Merged-In: I5010adfb3e1ce2880cb8f816f021c44257d9c521 Change-Id: I5010adfb3e1ce2880cb8f816f021c44257d9c521
2023-08-09Merge "Fix, DeviceCapabilityListener does not try to register IMS ↵Joonhun Shin
registration callback." into main
2023-08-02Fix, DeviceCapabilityListener does not try to register IMS registration ↵joonhunshin
callback. When IImsFeatureStatusCallback#notifyImsFeatureStatus() calls with unavailable and ready within short time, the PublishControllerImpl's handler calls DeviceCapabilityListener#onRcsConnected and #onRcsDisconnected consecutively. During this time the DeviceCapabilityListener keeps EVENT_UNREGISTER_IMS_CHANGE and EVENT_REGISTER_IMS_CONTENT_CHANGE messages in Q. When the DeviceCapabilityListener handles EVENT_UNREGISTER_IMS_CHANGE message, it removes EVENT_REGISTER_IMS_CONTENT_CHANGE from Q. By deleting EVENT_REGISTER_IMS_CONTENT_CHANGE, the DeviceCapabilityListener does not try to register the IMS registration callback. Bug: 287833083 Test: atest DeviceCapabilityListenerTest, RcsUceAdapterTest Test: AT&T and TMO live network Change-Id: I5010adfb3e1ce2880cb8f816f021c44257d9c521
2023-07-28[automerger skipped] Fixed NullPointException after SRVCC completed event ↵joonhunshin
am: 82845c3da7 am: a5ce91ab69 am: ec227a6181 am: d09b559755 am: bb0b91273f -s ours am skip reason: Merged-In I7e86d8b8190c65b757b753fab2ea4564a7fccf7c with SHA-1 7b3ec7ec4f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: I0d9e1eee026417db8861a7c9c7143f33bec23ad9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Fixed NullPointException after SRVCC completed event am: 82845c3da7 am: ↵joonhunshin
a5ce91ab69 am: ec227a6181 am: d09b559755 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: I089c60fb75111053660b0fc04304924253beaad5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Fixed NullPointException after SRVCC completed event am: 82845c3da7 am: ↵joonhunshin
a5ce91ab69 am: ec227a6181 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: Ibda4ed1ea5201dece5b9b5983f414820756fe32d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Fixed NullPointException after SRVCC completed event am: 82845c3da7 am: ↵joonhunshin
a5ce91ab69 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: Idc49e5968ae3cfa2b60c682e3c64f18912b23c7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Fixed NullPointException after SRVCC completed event am: 82845c3da7joonhunshin
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: I3f37c87615c539a4dd2aad2a20f929b52a4993a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Fixed NullPointException after SRVCC completed eventjoonhunshin
If IImsCallSessionListener.callSessionProgressing() is called from ImsService right after receiving SRVCC complete state event from RIL, Framework tries to access CallProfile. However, NPE was observed because CallProfile is released by SRVCC completed event. Bug: 286447293 Test: atest ImsCallTest Change-Id: I7e86d8b8190c65b757b753fab2ea4564a7fccf7c Merged-In: I7e86d8b8190c65b757b753fab2ea4564a7fccf7c
2023-07-12Fixed NullPointException after SRVCC completed eventjoonhunshin
If IImsCallSessionListener.callSessionProgressing() is called from ImsService right after receiving SRVCC complete state event from RIL, Framework tries to access CallProfile. However, NPE was observed because CallProfile is released by SRVCC completed event. Bug: 286447293 Test: atest ImsCallTest Change-Id: I7e86d8b8190c65b757b753fab2ea4564a7fccf7c
2023-03-22Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991 am: ↵Tyler Gunn
5b8016f332 am: 590e0af93f Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558 Change-Id: I3ac20abbbeab79cc325c2213be0f26fb035554d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991 am: ↵Tyler Gunn
5b8016f332 am: f61dbc7958 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558 Change-Id: I6a3a6ea7fb55e52e8e55bec067f27020d1dc2ac6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991 am: ↵Tyler Gunn
5b8016f332 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558 Change-Id: I7ca71ab662f6e506ca431cf012c9d3339fe0fe01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991 am: ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseTyler Gunn
5b8016f332 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558 Change-Id: If0fd4b7a311350e05819947d9c3f4eff8f242118 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991android14-devTyler Gunn
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558 Change-Id: I55980714b5fa0013137f9d39b72b08d068f4b245 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge "Block PUBLISH execution when the MmTel registered to avoid multiple ↵Automerger Merge Worker
am: ec0d702927 am: d1e82624a5"
2023-03-21Block PUBLISH execution when the MmTel registered to avoid multiple am: ↵joonhunshin
ec0d702927 am: d1e82624a5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/22122392 Change-Id: I26a535dce84c532310ba6c274effd4d44268dc1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Block PUBLISH execution when the MmTel registered to avoid multiple am: ↵joonhunshin
ec0d702927 am: a768c4f97a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/22122392 Change-Id: Iab903945c8390d769111fb43a6a24a6b48394964 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:34:00 +0000