Jackeagle authored Jun 20, 2024 and Mohammed Althaf Thayyil committed Jul 11, 2024

gitlab-cli: Fix URL

Pierre-Hugues Husson authored Nov 14, 2021 and Sahil Sonar committed Jun 24, 2024

Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e

Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/platform/frameworks/opt/net/ims into v1-u

Android 14.0.0 Release 50 (AP2A.240605.024)

Change-Id: I2c136e27329eccb10aca2809a7ea7ae4a392f010

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2946291



Change-Id: I062ebf48aac50c03c46a0764471973c0040dfd3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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>

This CL checks the CarrierConfig and user settings to determine if
the business call composer is enabled.

Bug: 324325516
Bug: 226518586 (root)
Test: CTS
Change-Id: Ice37eea8315c33013963a0db5779b0d1849a1974

Change-Id: I5f61de7208f5d12436b1bb1ce29628fd08ad7974

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

When phone is connected to non-terrestrial network, carrier can specify
whether to override Wi-Fi calling roaming mode or not using
KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL.

If KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL is set to true,
then Wi-Fi calling roaming mode is set to Wi-Fi preferred.

Bug: 318871716
Test: atest CarrierConfigManagerTest, atest ImsManagerTest,
atest WifiCallingSettingsForSubTest
Test Request Bug: 320807503

Change-Id: I47c4737942760fea113573fdbebe5fc0b244aca0

Change-Id: I00a55c388e9df0eb58a337a20d59c1037200ae7a

am skip reason: Merged-In I874715e2e0843427fbefe33343fbe2ab2b22dd9c with SHA-1 cf934c17 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/25974099



Change-Id: I23742da664a0d84c6ce76a7aba329257768a7ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 319669529
Merged-In: I874715e2e0843427fbefe33343fbe2ab2b22dd9c
Change-Id: I2a231ba9b6917dca40119ccfe93249abf719d3cc

Change-Id: I1bc553bf1fa59f8c1196a98db7d52375658e84e5

Bug: 312101946
Test: atest CtsTelephonyTestCases
Change-Id: Id532af27b9a778fdb9692b4fe78c0fbc210a7012

Change-Id: I94e7f93f3f53502de37982e6f90fddfb5dec2a5f

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

Change-Id: I612ef51ea848d4722d07adaa99692317b8a3e6f3

[automerger skipped] Merge Android 14 am: b502ecb8 -s ours am: a180a0f9 -s ours am: 6472beda -s ours am: 12ce5ee1 -s ours am: 98895624 -s ours

am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b 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>

[automerger skipped] Merge Android 14 am: b502ecb8 -s ours am: a180a0f9 -s ours am: 6472beda -s ours am: 12ce5ee1 -s ours

am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b 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>

[automerger skipped] Merge Android 14 am: b502ecb8 -s ours am: a180a0f9 -s ours am: 6472beda -s ours

am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b 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>

am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b 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>

am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b 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>

Bug: 298295554
Merged-In: I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f
Change-Id: I99f24e06b0b55d0f72eb8868f001cd3712f4a573

Change-Id: I7ec8167b534a79205a1fc22d65ede47741024cab

[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9 -s ours am: d6b8de91 -s ours am: acd9e70d -s ours am: c649d781 -s ours

am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f3 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>

[automerger skipped] Merge Android U (ab/10368041) am: 186ff7d9 -s ours am: d6b8de91 -s ours am: acd9e70d -s ours

am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f3 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>

am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f3 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>

am skip reason: Merged-In I55980714b5fa0013137f9d39b72b08d068f4b245 with SHA-1 5b8016f3 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>

Bug: 291102124
Merged-In: I55980714b5fa0013137f9d39b72b08d068f4b245
Change-Id: I7d2257f8205d89aedf04bf4482ecb11e1239ad6c

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>

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>

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>

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>

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>

Change-Id: I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f
Test: Owners only change.
Bug: 296459098

[automerger skipped] Merge "Fix, DeviceCapabilityListener does not try to register IMS registration callback." into main am: 472c5ca3 am: 37dcd44a am: 15e5f984 am: 3464c35d am: d859f7db -s ours

am skip reason: Merged-In I5010adfb3e1ce2880cb8f816f021c44257d9c521 with SHA-1 22504ae6 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>

Merge "Fix, DeviceCapabilityListener does not try to register IMS registration callback." into main am: 472c5ca3 am: 37dcd44a am: 15e5f984 am: 3464c35d

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>