diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index 2962e668..1c97fa6e 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -2,7 +2,7 @@ - - - - @@ -1591,76 +1593,72 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - + - - - - - - - - + + @@ -1685,6 +1683,10 @@ + + + + @@ -1716,12 +1718,12 @@ + + - - @@ -1734,23 +1736,23 @@ + + - - + + - - @@ -1761,13 +1763,13 @@ - - + + @@ -1830,7 +1832,6 @@ - @@ -1853,51 +1854,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1912,6 +1868,7 @@ + @@ -2230,6 +2187,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2258,10 +2294,6 @@ - - - - @@ -2322,9 +2354,6 @@ - - - @@ -2373,81 +2402,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2484,6 +2438,9 @@ + + + @@ -2593,6 +2550,8 @@ + + @@ -2649,6 +2608,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2863,9 +2864,9 @@ - + + - @@ -3068,8 +3069,8 @@ - - + + @@ -3090,9 +3091,9 @@ - + - + @@ -3108,7 +3109,7 @@ - + @@ -3241,11 +3242,11 @@ + + - - @@ -3559,25 +3560,25 @@ + + + - - - - + - - + + @@ -3590,19 +3591,15 @@ - - - - + + - - @@ -3610,22 +3607,32 @@ - - + + + + + + - - + + + + + + + + @@ -3646,12 +3653,6 @@ - - - - - - @@ -3741,8 +3742,8 @@ - - + + @@ -3785,10 +3786,10 @@ - - + + @@ -3797,9 +3798,9 @@ - + diff --git a/Patches/Common/wireless-regdb/db.txt b/Patches/Common/wireless-regdb/db.txt index 45ec3f3f..d7592c29 100644 --- a/Patches/Common/wireless-regdb/db.txt +++ b/Patches/Common/wireless-regdb/db.txt @@ -44,12 +44,15 @@ country AD: DFS-ETSI # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) +# Source: +# https://wam.ae/en/details/1395302898209 country AE: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR country AF: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -89,12 +92,15 @@ country AN: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS +# Source: +# https://www.boletinoficial.gob.ar/detalleAviso/primera/287126/20230524 country AR: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 7125 @ 320), (12), NO-OUTDOOR country AS: DFS-FCC (2402 - 2472 @ 40), (30) @@ -395,11 +401,14 @@ country CI: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +# Source: +# https://www.bcn.cl/leychile/navegar?idNorma=1109333&idParte=9841504&idVersion=&r_c=6 country CL: DFS-JP (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5735 - 5835 @ 80), (20) + (5925 - 6425 @ 320), (12), NO-OUTDOOR # Source: # https://wap.miit.gov.cn/cms_files/filemanager/1226211233/attach/20219/d125301b13454551b698ff5afa49ca28.pdf @@ -415,19 +424,26 @@ country CN: DFS-FCC (59400 - 63720 @ 2160), (44) (63720 - 65880 @ 2160), (28) +# Source: +# https://www.ane.gov.co/Sliders/archivos/gesti%C3%B3n%20t%C3%A9cnica/Estudios%20de%20gesti%C3%B3n%20y%20planeaci%C3%B3n/Banda%206%20GHz/Documentos%20decisi%C3%B3n/Resolucion%20000737%20del%2018112022.pdf country CO: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 7125 @ 320), (12), NO-OUTDOOR +# Source: +# https://storage.googleapis.com/eleoscompliance1.appspot.com/public/PNAF%20modificaci%C3%B3n%20ALCA87_30_04_2021.pdf country CR: DFS-FCC - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 20), (17) - (5250 - 5330 @ 20), (24), DFS - (5490 - 5730 @ 20), (24), DFS - (5735 - 5835 @ 20), (30) + (2402 - 2482 @ 40), (36) + (5170 - 5250 @ 20), (30) + (5250 - 5330 @ 20), (30), DFS + (5490 - 5730 @ 20), (30), DFS + (5735 - 5835 @ 20), (36) + (5875 - 5925 @ 20), (30) + (5925 - 7125 @ 320), (30), NO-OUTDOOR # Source: # https://www.mincom.gob.cu/es/marco-legal @@ -560,11 +576,14 @@ country DM: DFS-FCC (5250 - 5330 @ 80), (23), DFS, AUTO-BW (5735 - 5835 @ 80), (30) +# Source: +# https://indotel.gob.do/wp-content/uploads/2022/10/res_082_2022.pdf country DO: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (23), DFS, AUTO-BW (5735 - 5835 @ 80), (30) + (5925 - 7125 @ 320), (15), NO-OUTDOOR country DZ: DFS-JP (2402 - 2482 @ 40), (20) @@ -901,6 +920,7 @@ country IR: DFS-JP # EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611 # Harmonized CEPT countries (July 2019): https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf # IS: https://www.pfs.is/library/Skrar/Tidnir-og-taekni/MHZ_21022019.pdf +# CEPT ECC Decision (20)01 for 6GHz: https://docdb.cept.org/download/1448 country IS: DFS-ETSI (2400 - 2483.5 @ 40), (100 mW) (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI @@ -908,6 +928,7 @@ country IS: DFS-ETSI (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI # short range devices (ETSI EN 300 440-1) (5725 - 5875 @ 80), (25 mW) + (5945 - 6425 @ 320), (23), NO-OUTDOOR # 60 GHz band channels 1-4 (ETSI EN 302 567) (57000 - 66000 @ 2160), (40) @@ -936,10 +957,17 @@ country JM: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) -country JO: DFS-JP - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (23) - (5735 - 5835 @ 80), (23) +# Source: +# https://trc.gov.jo/EchoBusV3.0/SystemAssets/PDF/RSMD/cb9f9a83-43a6-4e66-8432-6e02ecaf465b_RLAN%20Arabic%20%20Final%20-%20clean%20with%2057-71%20GHz.pdf +# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf +country JO: DFS-ETSI + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), AUTO-BW + (5250 - 5350 @ 80), (23), DFS, AUTO-BW + (5470 - 5725 @ 80), (27), DFS, NO-OUTDOOR + (5725 - 5875 @ 80), (23), NO-OUTDOOR + (5925 - 6425 @ 320), (23), NO-OUTDOOR + (57000 - 71000 @ 2160), (40) # Source: # https://www.soumu.go.jp/main_content/000635492.pdf @@ -957,11 +985,17 @@ country JP: DFS-JP # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf (57000 - 66000 @ 2160), (10 mW) -country KE: DFS-JP - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (23) - (5490 - 5570 @ 80), (30), DFS - (5735 - 5775 @ 40), (23) +# Source: +# https://www.ca.go.ke/sites/default/files/2023-06/Guidelines-on-the-Use-of-Radiofrequency-Spectrum-by-Short-Range-Devices-2022.pdf +# ETSI EN 301 893: https://www.etsi.org/deliver/etsi_en/301800_301899/301893/02.01.01_60/en_301893v020101p.pdf +# ETSI EN 302 502: https://www.etsi.org/deliver/etsi_en/302500_302599/302502/02.01.01_60/en_302502v020101p.pdf +country KE: DFS-ETSI + (2400 - 2483.5 @ 40), (2000 mW) + (5150 - 5250 @ 80), (17), AUTO-BW + (5250 - 5350 @ 80), (17), DFS, AUTO-BW + (5470 - 5725 @ 80), (24), DFS + (5725 - 5875 @ 40), (24), DFS + (5925 - 6425 @ 320), (23), NO-OUTDOOR country KH: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -1050,6 +1084,8 @@ country LC: DFS-ETSI # LI: https://www.ofcomnet.ch/api/rir/1010/04 # LI: https://www.ofcomnet.ch/api/rir/1008/12 # LI: https://www.ofcomnet.ch/#/fatTable +# CEPT ECC Decision (20)01 for 6GHz: https://docdb.cept.org/download/1448 +# LI: https://www.ofcomnet.ch/api/rir/1010/11 country LI: DFS-ETSI (2400 - 2483.5 @ 40), (100 mW) (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI @@ -1057,6 +1093,7 @@ country LI: DFS-ETSI (5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI # short range devices (ETSI EN 300 440-1) (5725 - 5875 @ 80), (25 mW) + (5945 - 6425 @ 320), (23), NO-OUTDOOR # 60 GHz band channels 1-4 (ETSI EN 302 567) (57000 - 66000 @ 2160), (40) @@ -1133,10 +1170,13 @@ country LV: DFS-ETSI # 60 GHz band channels 1-4 (ETSI EN 302 567) (57000 - 66000 @ 2160), (40) +# Source: +# https://www.anrt.ma/sites/default/files/decision_a2fp_-vf-_mod_07.05.2021.pdf?csrt=14818568393101165775 country MA: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW + (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR # MC as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893) # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440) @@ -1209,19 +1249,26 @@ country MK: DFS-ETSI # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) +# Communications Regulatory Commission- CRC released Amendment to Resolution No. 37 of 2020 +# https://www.crc.gov.mn/storage/PDF/2022/2022-togtool1.pdf country MN: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (24), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 6425 @ 320), (100mW) +# Source: +# https://bo.io.gov.mo/bo/i/2024/16/despce.asp#64 country MO: DFS-FCC - (2402 - 2482 @ 40), (23) - (5170 - 5250 @ 80), (23), AUTO-BW - (5250 - 5330 @ 80), (23), DFS, AUTO-BW - (5490 - 5730 @ 160), (30), DFS - (5735 - 5835 @ 80), (30) + (2400 - 2483.5 @ 40), (200 mW) + (5150 - 5250 @ 80), (200 mW), AUTO-BW + (5250 - 5350 @ 80), (200 mW), DFS, AUTO-BW + (5470 - 5730 @ 160), (1000 mW), DFS + (5725 - 5850 @ 80), (1000 mW) + (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR + (57000 - 66000 @ 2160), (10000 mW) country MP: DFS-FCC (2402 - 2472 @ 40), (30) @@ -1263,12 +1310,15 @@ country MT: DFS-ETSI # 60 GHz band channels 1-4 (ETSI EN 302 567) (57000 - 66000 @ 2160), (40) +# Source: +# https://www.icta.mu/documents/2022/08/wifi6e_decision_0822.pdf country MU: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (24), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5945 - 6425 @ 320), (23), NO-OUTDOOR # Source: # http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf @@ -1284,19 +1334,26 @@ country MW: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS +# Source: +# https://www.ift.org.mx/sites/default/files/comunicacion-y-medios/comunicados-ift/comunicado13ift_1.pdf +# https://www.dof.gob.mx/nota_detalle.php?codigo=5681829&fecha=07/03/2023#gsc.tab=0 country MX: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 6425 @ 320), (12), NO-OUTDOOR +# Source: +# https://www.mcmc.gov.my/skmmgovmy/media/General/CA-No-1-of-2022_-signed_19012022.pdf country MY: DFS-FCC - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (24), AUTO-BW - (5250 - 5330 @ 80), (24), DFS, AUTO-BW - (5490 - 5650 @ 160), (24), DFS - (5735 - 5835 @ 80), (24) + (2402 - 2482 @ 40), (500 mW) + (5170 - 5250 @ 80), (1000 mW), AUTO-BW + (5250 - 5330 @ 80), (1000 mW), DFS, AUTO-BW + (5490 - 5650 @ 160), (1000 mW), DFS + (5735 - 5835 @ 80), (1000 mW) + (5925 - 6425 @ 320), (200 mW), NO-OUTDOOR country NG: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -1561,11 +1618,13 @@ country RW: DFS-FCC (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) +# Source: https://www.citc.gov.sa/en/RulesandSystems/RegulatoryDocuments/OtherRegulatoryDocuments/Documents/PL-PM-002-E-WiFi%20Regulations.pdf country SA: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS + (5925 - 7125 @ 320), (250 mW), NO-OUTDOOR # SE as part of EU/CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893) # and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440) @@ -1697,12 +1756,17 @@ country TG: DFS-ETSI (5250 - 5330 @ 40), (20), DFS (5490 - 5710 @ 40), (27), DFS +# Source: +# https://ratchakitcha.soc.go.th/documents/140D100S0000000004000.pdf +# https://ratchakitcha.soc.go.th/documents/140D100S0000000004200.pdf +# https://ratchakitcha.soc.go.th/documents/140D100S0000000004300.pdf country TH: DFS-FCC (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (17), AUTO-BW (5250 - 5330 @ 80), (24), DFS, AUTO-BW (5490 - 5730 @ 160), (24), DFS (5735 - 5835 @ 80), (30) + (5925 - 6425 @ 320), (250 mW), NO-OUTDOOR country TN: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -1887,11 +1951,13 @@ country YT: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI +# Source: https://www.gov.za/sites/default/files/gcis_document/202305/48643gon1822.pdf country ZA: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20), AUTO-BW (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (30) + (5925 - 6425 @ 320), (14) country ZW: DFS-ETSI (2402 - 2482 @ 40), (20) diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh index 8c539c62..f4466f42 100644 --- a/Scripts/Update_Commons.sh +++ b/Scripts/Update_Commons.sh @@ -29,12 +29,12 @@ wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineag #TODO: wireless-regdb, unused #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/ -#Last: 2024/06/13 +#Last: 2024/07/31 #TODO: MMS Configs #https://github.com/GrapheneOS/platform_packages_apps_Messaging -#Last: 2024/06/13 +#Last: 2024/07/31 #TODO: CA store #https://android.googlesource.com/platform/system/ca-certificates -#Last: 2024/06/13 +#Last: 2024/07/31