diff options
author | Xin Li <delphij@google.com> | 2023-10-05 15:41:27 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-10-05 15:41:27 -0700 |
commit | dec276ebd6613b01e878ebf064186613eea5739e (patch) | |
tree | e2354703107214146158df71311429201355e324 | |
parent | 9539705ae5133044e53617adff6fe1e8632d96dc (diff) | |
parent | 965628e6415210f8861fe540ba5ba4a24f3ccea7 (diff) | |
download | CarrierConfig-dec276ebd6613b01e878ebf064186613eea5739e.tar.gz |
Merge Android 14
Bug: 298295554
Merged-In: Id115e11eba115568aad1bb0bff9677f46ba5b88b
Change-Id: I21be7e0c011fb13ee19d3afe14417e569590809b
16 files changed, 40 insertions, 14 deletions
diff --git a/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml b/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml index a77e7f0..ad22e76 100644 --- a/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml +++ b/assets/carrier_config_carrierid_10008_Tracfone-VZW.xml @@ -7,4 +7,5 @@ <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F"/> </string-array> <boolean name="inflate_signal_strength_bool" value="true" /> + <boolean name="enabledTransID" value="true"/> </carrier_config> diff --git a/assets/carrier_config_carrierid_1010_Telekom-Romania.xml b/assets/carrier_config_carrierid_1010_Telekom-Romania.xml index 35225ba..32bc604 100644 --- a/assets/carrier_config_carrierid_1010_Telekom-Romania.xml +++ b/assets/carrier_config_carrierid_1010_Telekom-Romania.xml @@ -2,9 +2,11 @@ <carrier_config> <boolean name="display_hd_audio_property_bool" value="false"/> <boolean name="show_4g_for_lte_data_icon_bool" value="true"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="D0284ECDB391CF7AC3FE44A0966C149148FF77A8E33AC6C3260FEB43E29C3EEE:ro.telekom.myaccount"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_11_Slovak-Telekom.xml b/assets/carrier_config_carrierid_11_Slovak-Telekom.xml index e8dd2c2..ada4c1d 100644 --- a/assets/carrier_config_carrierid_11_Slovak-Telekom.xml +++ b/assets/carrier_config_carrierid_11_Slovak-Telekom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> <boolean name="show_4g_for_lte_data_icon_bool" value="true"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="A277FB2118A4C504F4F4CEC1AC21FC90376C530F113C1DA2C802A88FD55BA96B:com.telekom.portal"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml b/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml index 1494aca..cddc367 100644 --- a/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml +++ b/assets/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml @@ -4,10 +4,12 @@ <int name="maxImageHeight" value="1944"/> <int name="maxMessageSize" value="102400"/> <int name="maxImageWidth" value="2592"/> - <string-array name="carrier_certificate_string_array" num="4"> + <string-array name="carrier_certificate_string_array" num="6"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="1C97892608B6AA80C3B4AC5D41E3B4C4D5551C0585A923B4D82F77A961F3427E:com.morescreens.mkt"/> <item value="6EA117F9EF012340F40CF1AC370F5E908AC30377FEECDC2D9A7161B654FFB9E6:com.telekom.telekommk"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_1403_Rogers.xml b/assets/carrier_config_carrierid_1403_Rogers.xml index 3331a8e..b3798fe 100644 --- a/assets/carrier_config_carrierid_1403_Rogers.xml +++ b/assets/carrier_config_carrierid_1403_Rogers.xml @@ -6,6 +6,7 @@ <boolean name="voicemail_notification_persistent_bool" value="true"/> <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true"/> <boolean name="carrier_name_override_bool" value="true"/> + <boolean name="ratchet_nr_advanced_bandwidth_if_rrc_idle_bool" value="false"/> <int name="smsToMmsTextThreshold" value="6"/> <int name="recipientLimit" value="20"/> <int name="maxImageHeight" value="1944"/> diff --git a/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml b/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml index f4261e6..119720f 100644 --- a/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml +++ b/assets/carrier_config_carrierid_2088_Crnogorski-Telekom.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> <boolean name="display_hd_audio_property_bool" value="false"/> - <string-array name="carrier_certificate_string_array" num="5"> + <string-array name="carrier_certificate_string_array" num="7"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="1C97892608B6AA80C3B4AC5D41E3B4C4D5551C0585A923B4D82F77A961F3427E:com.morescreens.cgt"/> <item value="D0284ECDB391CF7AC3FE44A0966C149148FF77A8E33AC6C3260FEB43E29C3EEE:me.telekom.myaccount"/> <item value="5B149BCFB8533EE87A012A086634958270CE937F9EAC6CAAC35A614B1129EF6C:com.telekom.telekomme"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_2091_Bonbon.xml b/assets/carrier_config_carrierid_2091_Bonbon.xml index 2d838b8..38bdbe0 100644 --- a/assets/carrier_config_carrierid_2091_Bonbon.xml +++ b/assets/carrier_config_carrierid_2091_Bonbon.xml @@ -7,9 +7,11 @@ <item value="95"/> <item value="96"/> </string-array> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="CC12A9016142DD2080D20F8075C5CC418F64423D3EA773AEC3C838A51508569C:com.hrvatskitelekom.m.mojT"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_2092_congstar.xml b/assets/carrier_config_carrierid_2092_congstar.xml index 3856077..0b3d1d6 100644 --- a/assets/carrier_config_carrierid_2092_congstar.xml +++ b/assets/carrier_config_carrierid_2092_congstar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> - <string-array name="carrier_certificate_string_array" num="7"> + <string-array name="carrier_certificate_string_array" num="8"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/> <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> @@ -8,5 +8,6 @@ <item value="326D12BC1FC90959DA07EFE47CC23949E4E565E78BF7BECFAA919F7F7D9276A3:de.congstar.fraenk"/> <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/> <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements,de.telekom.android.customercenter,de.congstar.meincongstar,de.congstar.fraenk,de.congstar.ja,de.congstar.penny,de.telekom.bflexz"/> </string-array> </carrier_config> diff --git a/assets/carrier_config_carrierid_3_Telekom.xml b/assets/carrier_config_carrierid_3_Telekom.xml index c0f2f96..20c5555 100644 --- a/assets/carrier_config_carrierid_3_Telekom.xml +++ b/assets/carrier_config_carrierid_3_Telekom.xml @@ -3,7 +3,7 @@ <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true"/> <boolean name="carrier_supports_ss_over_ut_bool" value="true"/> <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,10;connected,legacy,10;not_restricted_rrc_idle,legacy,10;not_restricted_rrc_con,legacy,10</string> - <string-array name="carrier_certificate_string_array" num="7"> + <string-array name="carrier_certificate_string_array" num="8"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/> <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> @@ -11,5 +11,6 @@ <item value="326D12BC1FC90959DA07EFE47CC23949E4E565E78BF7BECFAA919F7F7D9276A3:de.congstar.fraenk"/> <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/> <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements,de.telekom.android.customercenter,de.congstar.meincongstar,de.congstar.fraenk,de.congstar.ja,de.congstar.penny,de.telekom.bflexz"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_4_Magenta-Telekom.xml b/assets/carrier_config_carrierid_4_Magenta-Telekom.xml index 877359f..eba572f 100644 --- a/assets/carrier_config_carrierid_4_Magenta-Telekom.xml +++ b/assets/carrier_config_carrierid_4_Magenta-Telekom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> <boolean name="display_hd_audio_property_bool" value="false"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="E19DB5D5DDB900229C81DEF1C8C86DD2457AFDEED7676C89DF6EF11D5EEA5E6D:at.tmobile.android.myt"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_6_T-Mobile.xml b/assets/carrier_config_carrierid_6_T-Mobile.xml index 3d09265..62717db 100644 --- a/assets/carrier_config_carrierid_6_T-Mobile.xml +++ b/assets/carrier_config_carrierid_6_T-Mobile.xml @@ -3,9 +3,11 @@ <boolean name="carrier_volte_available_bool" value="true"/> <boolean name="display_hd_audio_property_bool" value="false"/> <int name="volte_replacement_rat_int" value="3"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="A1F6E367AC03F6A0018EBF1F1FCDD971129F5BAA2A77FC1782B9ECF3C819FEF7:cz.tmobile.oneapp"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_747_COSMOTE.xml b/assets/carrier_config_carrierid_747_COSMOTE.xml index e9f39a7..61dd0ca 100644 --- a/assets/carrier_config_carrierid_747_COSMOTE.xml +++ b/assets/carrier_config_carrierid_747_COSMOTE.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> - <string-array name="carrier_certificate_string_array" num="5"> + <string-array name="carrier_certificate_string_array" num="7"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="1C435EDC05148B8A9365A8625FEFFC87B8289B83FD893C2877B27BB08ED2444D:gr.cosmote.myaccount.widget"/> <item value="4828585D815D9E27444FC38CD74D13296332043BBF53DA71277B6D5C1A97022B:gr.cosmote.whatsup"/> <item value="9F3DD33751029CD02AFC39D5C650533E542AA6E4FE0A647DF096B2F5D1907299:gr.cosmote.frog"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_7_T-Mobile.xml b/assets/carrier_config_carrierid_7_T-Mobile.xml index 805b6f0..1948d14 100644 --- a/assets/carrier_config_carrierid_7_T-Mobile.xml +++ b/assets/carrier_config_carrierid_7_T-Mobile.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> <boolean name="display_hd_audio_property_bool" value="false"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="46D1992DA14DCDAB5CDF8D3C4C965D5D11A2534A40F323DFFF127751B706724F:pl.tmobile.miboa"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_8_Magyar-Telekom.xml b/assets/carrier_config_carrierid_8_Magyar-Telekom.xml index b148c3d..2c63a9d 100644 --- a/assets/carrier_config_carrierid_8_Magyar-Telekom.xml +++ b/assets/carrier_config_carrierid_8_Magyar-Telekom.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <carrier_config> <boolean name="display_hd_audio_property_bool" value="false"/> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="7A9B86BEA0983E9999B7991A29654B8E6BE50AEAFD38200DCF2B32B951F0AA5D:hu.telekom.telekomapp"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml b/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml index f74f9ff..d9406d8 100644 --- a/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml +++ b/assets/carrier_config_carrierid_9_Hrvaski-Telekom.xml @@ -8,9 +8,11 @@ <item value="95"/> <item value="96"/> </string-array> - <string-array name="carrier_certificate_string_array" num="3"> + <string-array name="carrier_certificate_string_array" num="5"> <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/> <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/> <item value="CC12A9016142DD2080D20F8075C5CC418F64423D3EA773AEC3C838A51508569C:com.hrvatskitelekom.m.mojT"/> + <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/> + <item value="FFEE87CCC88845E8918C7271318A9B3A9F4222F8D71F1D84D1B0C88789147F03:de.telekom.tsc,de.telekom.appstarter,de.telekom.smartcredentials.entitlements"/> </string-array> </carrier_config>
\ No newline at end of file diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml index 9002ea4..8f14d32 100644 --- a/tests/AndroidTest.xml +++ b/tests/AndroidTest.xml @@ -14,7 +14,7 @@ limitations under the License. --> <configuration description="Run Tests for CarrierConfig."> - <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <option name="test-file-name" value="CarrierConfigTests.apk" /> </target_preparer> |