diff --git a/Misc/android-devel/PKGBUILD b/Misc/android-devel/PKGBUILD
deleted file mode 100644
index 2960c489..00000000
--- a/Misc/android-devel/PKGBUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-#Created from aosp-devel and lineageos-devel by p4block
-pkgname=android-devel
-pkgver=0.1
-pkgrel=1
-pkgdesc='Metapackage to pull all dependencies required to build Android'
-arch=('x86_64')
-url='https://wiki.archlinux.org/index.php/Android#Building_Android'
-license=('None')
-depends=('gcc' 'git' 'gnupg' 'flex' 'bison' 'gperf' 'sdl' 'wxgtk' 'squashfs-tools' 'curl' 'ncurses' 'zlib' 'schedtool' 'perl-switch' 'zip' 'unzip' 'libxslt' 'python2-virtualenv' 'bc' 'rsync' 'lib32-zlib' 'lib32-ncurses' 'lib32-readline' 'xml2' 'lzop' 'pngcrush' 'imagemagick' 'repo' 'ccache' 'maven' 'gradle' 'ninja' 'lib32-ncurses5-compat-libs' 'ncurses5-compat-libs' 'firejail' 'optipng' 'jpegoptim')
diff --git a/Misc/pick-imports/importer.java b/Misc/asb.java
similarity index 100%
rename from Misc/pick-imports/importer.java
rename to Misc/asb.java
diff --git a/Misc/bringup b/Misc/bringup
deleted file mode 100644
index 1d7dfd36..00000000
--- a/Misc/bringup
+++ /dev/null
@@ -1,21 +0,0 @@
-Devices not on recent versions with newer unofficial builds available:
-
-himaul, currently 14.1:
-https://forum.xda-developers.com/t/rom-11-0-0-himaul-himawl-lineageos-18-1-unofficial.4199175/
-https://forum.xda-developers.com/t/rom-10-0-0-himaul-himawl-lineageos-17-1-unofficial.3994825/
-
-m7, currently 14.1:
-broken - https://forum.xda-developers.com/t/rom-11-0-unofficial-m7-all-lineageos-18-1-stable.4187799/
-https://forum.xda-developers.com/t/rom-10-0-unofficial-m7-all-lineageos-17-1-stable.3969563/
-
-bullhead, currently 15.1
-missing source code - https://forum.xda-developers.com/t/rom-11-unofficial-lineageos-18-1-2021-08-09-discontinued.4318251/
-https://forum.xda-developers.com/t/rom-unofficial-lineageos-17-1-blod-patched-2021-08-09.4049993/
-https://forum.xda-developers.com/t/rom-kernel-unofficial-optimized-lineageos-17-1.4163495/
-
-angler, currently 15.1
-broken - https://forum.xda-developers.com/t/rom-unofficial-lineageos-18-1-for-nexus-6p-angler.4206397/
-https://forum.xda-developers.com/t/rom-unofficial-lineageos-17-1-for-nexus-6p-angler.4012099/
-
-dragon, currently 15.1
-broken - https://forum.xda-developers.com/t/rom-unofficial-lineageos-18-1-dragon-2021-10-06.3591152/
diff --git a/Misc/pick-imports/16-asbs-download.sh b/Misc/pick-imports/16-asbs-download.sh
deleted file mode 100644
index 057669fd..00000000
--- a/Misc/pick-imports/16-asbs-download.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-wget https://github.com/LineageOS/android_frameworks_base/commit/ea52854b208d2a8e367c65068edbdff741b9eb80.patch -O android_frameworks_base/330961.patch; #P_asb_2022-05 Keyguard - Treat messsages to lock with priority
-wget https://github.com/LineageOS/android_frameworks_base/commit/6bc4a89b9680b780768ee2b92a01f979b708c00b.patch -O android_frameworks_base/330962.patch; #P_asb_2022-05 Verify caller before auto granting slice permission
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/e298920fbeb8714698c6e96beaff71383640878b.patch -O android_packages_services_Telecomm/330959.patch; #P_asb_2022-05 Handle null bindings returned from ConnectionService.
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/cfe47c5ab58c17fe9e2b580874878347461d8695.patch -O android_packages_apps_Settings/330960.patch; #P_asb_2022-05 Hide private DNS settings UI in Guest mode
-wget https://github.com/LineageOS/android_frameworks_base/commit/a1c1383a08e17e14273e0f2e7d1c250fb4e3b7f2.patch -O android_frameworks_base/330963.patch; #P_asb_2022-05 Always restart apps if base.apk gets updated.
-wget https://github.com/LineageOS/android_external_aac/commit/e40800a613eb89b5b4c701774c3cecc1c2b7dd6c.patch -O android_external_aac/332775.patch; #P_asb_2022-06 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
-wget https://github.com/LineageOS/android_frameworks_base/commit/4005549db2fa7e1524fc0dbbe22c774fb00b6cb3.patch -O android_frameworks_base/332779.patch; #P_asb_2022-06 Prevent non-admin users from deleting system apps.
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/526bbbb30625c4b2728d4c461137413dbd1a96f6.patch -O android_packages_services_Telecomm/332764.patch; #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10
-wget https://github.com/LineageOS/android_system_core/commit/976019d07ad1c007043b78450857f428a1440f06.patch -O android_system_core/332765.patch; #P_asb_2022-06 Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host.
-wget https://github.com/LineageOS/android_frameworks_base/commit/c8da70733ac6be9b209b27b8bd72f9b0f0a2ee44.patch -O android_frameworks_base/332778.patch; #P_asb_2022-06 Fix security hole in GateKeeperResponse
-wget https://github.com/LineageOS/android_frameworks_base/commit/e7f0f7bac948a3deb2ef9139ef4fd9ad9eb1215a.patch -O android_frameworks_base/332777.patch; #P_asb_2022-06 Add an OEM configurable limit for zen rules
-wget https://github.com/LineageOS/android_frameworks_base/commit/c6a97af0e9b22c303d13ad573e96eb4b06c0bfa3.patch -O android_frameworks_base/332776.patch; #P_asb_2022-06 Update GeofenceHardwareRequestParcelable to match parcel/unparcel format.
-wget https://github.com/LineageOS/android_frameworks_base/commit/76c531e222779ae68047010f42f7a36100010f4c.patch -O android_frameworks_base/332757.patch; #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10; api doc update
-wget https://github.com/LineageOS/android_frameworks_base/commit/258ab4cfd77e49b087f4b3333c21ecb23d4c2a9f.patch -O android_frameworks_base/332756.patch; #P_asb_2022-06 Add finalizeWorkProfileProvisioning.
-wget https://github.com/LineageOS/android_packages_apps_Nfc/commit/d7722eaa4defeaea88dce9f3c644e038af3f637d.patch -O android_packages_apps_Nfc/332762.patch; #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/ecf8fd5a9aa4976ace98fe9a4986f1de3ff77c1d.patch -O android_packages_apps_Settings/332763.patch; #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-wget https://github.com/LineageOS/android_packages_apps_Dialer/commit/71701cfc7511cd3ad2e8a0f0f12dd78ea8db2517.patch -O android_packages_apps_Dialer/332761.patch; #P_asb_2022-06 No longer export CallSubjectDialog
-wget https://github.com/LineageOS/android_packages_apps_Contacts/commit/5055718d99866a7783cf72199b3f385e68bc7a53.patch -O android_packages_apps_Contacts/332760.patch; #P_asb_2022-06 No longer export CallSubjectDialog
-wget https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/6ff1c1f2e637e0dc3fc803f8028c7b89bae74937.patch -O android_packages_apps_Bluetooth/332759.patch; #P_asb_2022-06 Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission.
-wget https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/eb31965a73439dc8638d03b23f4648774a05df57.patch -O android_packages_apps_Bluetooth/332758.patch; #P_asb_2022-06 Removes app access to BluetoothAdapter#setScanMode by requiring BLUETOOTH_PRIVILEGED permission.
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_packages_apps_Nfc/commit/08fbee6160c576d2d9feff91af2ed3ce0bff2cb7.patch -O android_vendor_nxp_opensource_packages_apps_Nfc/332773.patch; #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-wget https://github.com/LineageOS/android_system_nfc/commit/318f09ce7e384809e3ab68c0294be96da6bf5141.patch -O android_system_nfc/332766.patch; #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-wget https://github.com/LineageOS/android_system_nfc/commit/af0a965cd72fa6cab442fc46068fe4e556ca14c3.patch -O android_system_nfc/332767.patch; #P_asb_2022-06 Double Free in ce_t4t_data_cback
-wget https://github.com/LineageOS/android_system_nfc/commit/09dd85730f6c7ea4e2da2a9bf51de5d45a3b1061.patch -O android_system_nfc/332768.patch; #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/a6c1507a0fa5a844514ecae89d0758ccb8724585.patch -O android_vendor_nxp_opensource_external_libnfc-nci/332769.patch; #P_asb_2022-06 Prevent OOB write in nfc_ncif_proc_ee_discover_req
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/9dd0310855fa8889217e4e077bcfc7822abdbdc2.patch -O android_vendor_nxp_opensource_external_libnfc-nci/332770.patch; #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/84a8c1e3350174c25da59c7c6479b0dca37df111.patch -O android_vendor_nxp_opensource_external_libnfc-nci/332771.patch; #P_asb_2022-06 Double Free in ce_t4t_data_cback
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/d5b6e36b4d5585d3e003d16ba6aa73929ae7255d.patch -O android_vendor_nxp_opensource_external_libnfc-nci/332772.patch; #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-wget https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/82c9270c2cf11b9a2ac4b5942f3ec086bc02099c.patch -O android_packages_apps_EmergencyInfo/342101.patch; #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-wget https://github.com/LineageOS/android_frameworks_base/commit/862a9ed37b4cc89f450e6159cec65552e6e9fd38.patch -O android_frameworks_base/334256.patch; #P_asb_2022-07 StorageManagerService: don't ignore failures to prepare user storage
-wget https://github.com/LineageOS/android_frameworks_base/commit/10600c7c0cb582877cae6d3a28c9e39a73add1e1.patch -O android_frameworks_base/334257.patch; #P_asb_2022-07 UserDataPreparer: reboot to recovery if preparing user storage fails
-wget https://github.com/LineageOS/android_frameworks_base/commit/44130eac9f128dbea908171de1fa0743f2dda709.patch -O android_frameworks_base/334258.patch; #P_asb_2022-07 UserDataPreparer: reboot to recovery for system user only
-wget https://github.com/LineageOS/android_frameworks_base/commit/8b1d16f79b125ea356d7af582fc6ceac297afa04.patch -O android_frameworks_base/334259.patch; #P_asb_2022-07 Ignore errors preparing user storage for existing users
-wget https://github.com/LineageOS/android_frameworks_base/commit/2688ed5ff6c1c637444ba776d730940769b2ee1d.patch -O android_frameworks_base/334260.patch; #P_asb_2022-07 Log to EventLog on prepareUserStorage failure
-wget https://github.com/LineageOS/android_frameworks_base/commit/bcede32d6c0c192b00fa745e522d50b817ea969b.patch -O android_frameworks_base/334262.patch; #P_asb_2022-07 Crash invalid FGS notifications
-wget https://github.com/LineageOS/android_packages_apps_KeyChain/commit/5e04f66b9db71a74b7dbf6ca9a43b602d5fca122.patch -O android_packages_apps_KeyChain/334264.patch; #P_asb_2022-07 Encode authority part of uri before showing in UI
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/1fee30e9946eec7ec5b0c95481317cd1647c92a7.patch -O android_packages_apps_Settings/334265.patch; #P_asb_2022-07 Fix LaunchAnyWhere in AppRestrictionsFragment
-wget https://github.com/LineageOS/android_system_bt/commit/b15c9cc55faddbdb36df6af086762adfef028bbe.patch -O android_system_bt/334266.patch; #P_asb_2022-07 Security: Fix out of bound write in HFP client
-wget https://github.com/LineageOS/android_system_bt/commit/5d7b97ac9aa45287bf57d061b7e1e0287c7c513a.patch -O android_system_bt/334267.patch; #P_asb_2022-07 Check Avrcp packet vendor length before extracting length
-wget https://github.com/LineageOS/android_frameworks_opt_telephony/commit/4e3e190ff664797f23039da13a45a70ddf615489.patch -O android_frameworks_opt_telephony/334263.patch; #P_asb_2022-07 Enforce privileged phone state for getSubscriptionProperty(GROUP_UUID)
-wget https://github.com/LineageOS/android_system_bt/commit/f41d68b53f669b96787f5fde38bdc5fe73e795b8.patch -O android_system_bt/334268.patch; #P_asb_2022-07 Security: Fix out of bound read in AT_SKIP_REST
-wget https://github.com/LineageOS/android_frameworks_base/commit/35c2fc9116afdd6fe2dcca6e4fb59466a317b342.patch -O android_frameworks_base/335117.patch; #P_asb_2022-08 Only allow system and same app to apply relinquishTaskIdentity
-wget https://github.com/LineageOS/android_system_bt/commit/8bfd408fa1ebf3d8dc2fc9906672c7cfe7dc0144.patch -O android_system_bt/335109.patch; #P_asb_2022-08 Removing bonded device when auth fails due to missing keys
-wget https://github.com/LineageOS/android_packages_providers_ContactsProvider/commit/3b27f760484b42cc1ea25af7bdeb68b40cdfa455.patch -O android_packages_providers_ContactsProvider/335110.patch; #P_asb_2022-08 enforce stricter CallLogProvider query
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/9dfc928466d7709c968adcba7f22378e243b99f2.patch -O android_packages_apps_Settings/335111.patch; #P_asb_2022-08 Verify ringtone from ringtone picker is audio
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/539f79473852aab2bebcc7374404f47eccb297b1.patch -O android_packages_apps_Settings/335112.patch; #P_asb_2022-08 Make bluetooth not discoverable via SliceDeepLinkTrampoline
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/b8e381a8e5b104a455efb6b4352eee04b1fb4a5c.patch -O android_packages_apps_Settings/335113.patch; #P_asb_2022-08 Fix: policy enforcement for location wifi scanning
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/83ce5e4d8f0bb352ed433e711acacdd1a51130fe.patch -O android_packages_apps_Settings/335114.patch; #P_asb_2022-08 Fix Settings crash when setting a null ringtone
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/91b6470dde8a9b2586273796c183a29000a82ce5.patch -O android_packages_apps_Settings/335115.patch; #P_asb_2022-08 Fix can't change notification sound for work profile.
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/ccebafea047fef8ab93c4e748ab1b9a15280702b.patch -O android_packages_apps_Settings/335116.patch; #P_asb_2022-08 Extract app label from component name in notification access confirmation UI
-wget https://github.com/LineageOS/android_frameworks_base/commit/a532c1aeec285ebd601ceb266f0af8553ccef5df.patch -O android_frameworks_base/335118.patch; #P_asb_2022-08 Suppress notifications when device enter lockdown
-wget https://github.com/LineageOS/android_frameworks_base/commit/017b9b6b000693a5e48ba7431bf638c257833ec3.patch -O android_frameworks_base/335119.patch; #P_asb_2022-08 Remove package title from notification access confirmation intent
-wget https://github.com/LineageOS/android_frameworks_base/commit/53f3e590ac533cacdf7e78ec701a8e365c89901b.patch -O android_frameworks_base/335121.patch; #P_asb_2022-08 Only allow the system server to connect to sync adapters
-wget https://github.com/LineageOS/android_frameworks_base/commit/cb2cb0520dd1f4c7e19e806cde02fc3da6a355d2.patch -O android_frameworks_base/335120.patch; #P_asb_2022-08 Stop using invalid URL to prevent unexpected crash
-wget https://github.com/LineageOS/android_frameworks_base/commit/26e3268f3cac1d120d8b4683e8d5201b70f44fc2.patch -O android_frameworks_base/338346.patch; #P_asb_2022-09 Fix duplicate permission privilege escalation
-wget https://github.com/LineageOS/android_frameworks_base/commit/b98ed505d5c477f5d6e1f88433a5c9f1cb03025e.patch -O android_frameworks_base/338347.patch; #P_asb_2022-09 Parcel: recycle recycles
-wget https://github.com/LineageOS/android_frameworks_base/commit/3a1887eb6147d7e51a79c387aaed38c08056c789.patch -O android_frameworks_base/338348.patch; #P_asb_2022-09 IMMS: Make IMMS PendingIntents immutable
-wget https://github.com/LineageOS/android_frameworks_base/commit/031578d71058c6400ea91b1806b467aca2de54b1.patch -O android_frameworks_base/338349.patch; #P_asb_2022-09 Remove package name from SafetyNet logs
-wget https://github.com/LineageOS/android_external_expat/commit/31f7a33a236a574c7c4bea5de648c349fa1e7508.patch -O android_external_expat/338353.patch; #P_asb_2022-09 Prevent integer overflow in copyString
-wget https://github.com/LineageOS/android_external_expat/commit/5c70aa4e573cf46f6127aa6713c09877a246bf6b.patch -O android_external_expat/338354.patch; #P_asb_2022-09 Prevent XML_GetBuffer signed integer overflow
-wget https://github.com/LineageOS/android_external_expat/commit/68116f18efee226636fdc2ecf518f3de589c98a8.patch -O android_external_expat/338355.patch; #P_asb_2022-09 Prevent integer overflow in function doProlog
-wget https://github.com/LineageOS/android_external_expat/commit/883c4901f5ca13cf202c9c234612e117f0ef092e.patch -O android_external_expat/338356.patch; #P_asb_2022-09 Prevent more integer overflows
-wget https://github.com/LineageOS/android_system_bt/commit/a940244a653c0c20e5d08aaf40484da93300dc3f.patch -O android_system_bt/338350.patch; #P_asb_2022-09 Fix OOB in bnep_is_packet_allowed
-wget https://github.com/LineageOS/android_system_bt/commit/de882ad1be24fa351ad8ba483b89c2b0b1e615c6.patch -O android_system_bt/338351.patch; #P_asb_2022-09 Fix OOB in BNEP_Write
-wget https://github.com/LineageOS/android_system_bt/commit/88b4c659bc53971605a5cdde56f94b2d90677d20.patch -O android_system_bt/338352.patch; #P_asb_2022-09 Fix OOB in reassemble_and_dispatch
-wget https://github.com/LineageOS/android_external_dtc/commit/d8ff0456cbe3b32b5f71dd0740f9a6cca6de27b9.patch -O android_external_dtc/342096.patch; #P_asb_2022-10 libfdt: fdt_offset_ptr(): Fix comparison warnings
-wget https://github.com/LineageOS/android_system_bt/commit/024bd7b32e3298ceaf70443e9224aff56cf8de4b.patch -O android_system_bt/342097.patch; #P_asb_2022-10 Fix potential interger overflow when parsing vendor response
-wget https://github.com/LineageOS/android_system_nfc/commit/f7eb9ba0755d2ab170d7fa7f46d67ebed4690426.patch -O android_system_nfc/342098.patch; #P_asb_2022-10 The length of a packet should be non-zero
-wget https://github.com/LineageOS/android_frameworks_base/commit/950c44f0e7229672ea093e86d7f05df00b33844d.patch -O android_frameworks_base/342100.patch; #P_asb_2022-10 Limit the number of concurrently snoozed notifications
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/c5cae87d66c3b8d459677da775cc61e550bba993.patch -O android_vendor_nxp_opensource_external_libnfc-nci/342099.patch; #P_asb_2022-10 The length of a packet should be non-zero
-wget https://github.com/LineageOS/android_packages_apps_PackageInstaller/commit/79fbc97fa9030bc872c26dde69d3d6b5ca50d42c.patch -O android_packages_apps_PackageInstaller/344181.patch; #P_asb_2022-11 Hide overlays on ReviewPermissionsAtivity
-wget https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/915289305d5bd55c3a9e5667acab9cfec8f68d31.patch -O android_packages_providers_TelephonyProvider/344182.patch; #P_asb_2022-11 Check dir path before updating permissions.
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/9bd081d4162ee1bd99eed4a2f8c144255a3b7a41.patch -O android_packages_services_Telecomm/344183.patch; #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-wget https://github.com/LineageOS/android_system_bt/commit/b8332ffa326c412c7952bcae1ad924a8542caa8e.patch -O android_system_bt/344184.patch; #P_asb_2022-11 Add negative length check in process_service_search_rsp
-wget https://github.com/LineageOS/android_system_bt/commit/9e3a7208a794cb350b5b1565db4e1120d7b1373d.patch -O android_system_bt/344185.patch; #P_asb_2022-11 Add buffer in pin_reply in bluetooth.cc
-wget https://github.com/LineageOS/android_frameworks_base/commit/fcd8dc4d686c362b7353f9d7c6a3b05994cc0565.patch -O android_frameworks_base/344168.patch; #P_asb_2022-11 Move accountname and typeName length check from Account.java to AccountManagerService.
-wget https://github.com/LineageOS/android_frameworks_base/commit/bad61936167d1d7eca8dc155e8c0c8a248a2bc5c.patch -O android_frameworks_base/344169.patch; #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-wget https://github.com/LineageOS/android_frameworks_base/commit/e72558a547d48190469c0763a9e317d1792a9f53.patch -O android_frameworks_base/344170.patch; #P_asb_2022-11 Do not send new Intent to non-exported activity when navigateUpTo
-wget https://github.com/LineageOS/android_frameworks_base/commit/6a42e12de4cf0f2de93cbd8bb4506de8a83dd88a.patch -O android_frameworks_base/344171.patch; #P_asb_2022-11 Do not send AccessibilityEvent if notification is for different user.
-wget https://github.com/LineageOS/android_frameworks_base/commit/36b533a308ced7203f515daed97d0f15bb65587f.patch -O android_frameworks_base/344172.patch; #P_asb_2022-11 Trim any long string inputs that come in to AutomaticZenRule
-wget https://github.com/LineageOS/android_frameworks_base/commit/114dcf0b5836c0c982a560e85350f408c8640bdf.patch -O android_frameworks_base/344173.patch; #P_asb_2022-11 Check permission for VoiceInteraction
-wget https://github.com/LineageOS/android_frameworks_base/commit/22e363c319e6fddeea39f00f7ef5e63395a45dc5.patch -O android_frameworks_base/344174.patch; #P_asb_2022-11 Do not dismiss keyguard after SIM PUK unlock
-wget https://github.com/LineageOS/android_hardware_nxp_nfc/commit/70c3eef94c74e78d9bf9e9119d58ca0a5082cf2f.patch -O android_hardware_nxp_nfc/344180.patch; #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-wget https://github.com/LineageOS/android_external_dtc/commit/c34b2c464b0900d3e79aa1c64c25137fd09c4762.patch -O android_external_dtc/344161.patch; #P_asb_2022-11 Fix integer wrap sanitisation.
-wget https://github.com/LineageOS/android_frameworks_av/commit/2692e4bcdba06eec20424291acaac5669acf581f.patch -O android_frameworks_av/344167.patch; #P_asb_2022-11 setSecurityLevel in clearkey
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_halimpl/commit/9d9f191dd2522aa286bdc3c42d6777b6e503356b.patch -O android_vendor_nxp_opensource_halimpl/344190.patch; #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-wget https://github.com/LineageOS/android_system_bt/commit/cea94f7ab0d36254a99d5854b9c2e83afd4584bc.patch -O android_system_bt/345915.patch; #P_asb_2022-12 Added max buffer length check
-wget https://github.com/LineageOS/android_system_bt/commit/56ea90b69d6715e7e1f0ddd35fd5ca7e19d93dc6.patch -O android_system_bt/345916.patch; #P_asb_2022-12 Add missing increment in bnep_api.cc
-wget https://github.com/LineageOS/android_system_bt/commit/da6430bd4b319f8398deaef8d74341234fb79624.patch -O android_system_bt/345917.patch; #P_asb_2022-12 Add length check when copy AVDT and AVCT packet
-wget https://github.com/LineageOS/android_system_bt/commit/222fad2e71f159e3d6e0bc0aef36f83cbf3fcdfa.patch -O android_system_bt/345918.patch; #P_asb_2022-12 Fix integer overflow when parsing avrc response
-wget https://github.com/LineageOS/android_frameworks_base/commit/16da2229db1aa80499b296bc8c384fe78add0e30.patch -O android_frameworks_base/345892.patch; #P_asb_2022-12 Revert "Prevent non-admin users from deleting system apps."
-wget https://github.com/LineageOS/android_frameworks_base/commit/921f748f4dd12465721dc7e8ed86f89c0718da57.patch -O android_frameworks_base/345893.patch; #P_asb_2022-12 Limit the size of NotificationChannel and NotificationChannelGroup
-wget https://github.com/LineageOS/android_frameworks_base/commit/4bdaa78394c95a864f1d34ec1997c6494dbece15.patch -O android_frameworks_base/345894.patch; #P_asb_2022-12 Prevent non-admin users from deleting system apps.
-wget https://github.com/LineageOS/android_frameworks_base/commit/c8ac5b6a05bb584e196b4c1bd4b819914c4018b6.patch -O android_frameworks_base/345895.patch; #P_asb_2022-12 Validate package name passed to setApplicationRestrictions.
-wget https://github.com/LineageOS/android_frameworks_base/commit/9e0a825e2ca0cf102fc462af55f5a471d6d5836d.patch -O android_frameworks_base/345896.patch; #P_asb_2022-12 Include all enabled services when FEEDBACK_ALL_MASK.
-wget https://github.com/LineageOS/android_frameworks_base/commit/8d88ee0de3b9e474fcc70ab121186df93bf75456.patch -O android_frameworks_base/345897.patch; #P_asb_2022-12 [pm] forbid deletion of protected packages
-wget https://github.com/LineageOS/android_frameworks_base/commit/c4763f78a2ab695992cf63709b665c7478d43891.patch -O android_frameworks_base/345898.patch; #P_asb_2022-12 Fix NPE
-wget https://github.com/LineageOS/android_frameworks_base/commit/08605e9ee1e96336fe3202066a6cdba21cf377ad.patch -O android_frameworks_base/345899.patch; #P_asb_2022-12 Fix a security issue in app widget service.
-wget https://github.com/LineageOS/android_frameworks_base/commit/4d5e30ccea8cc4dec6359f004173d896c4b01556.patch -O android_frameworks_base/345900.patch; #P_asb_2022-12 Ignore malformed shortcuts
-wget https://github.com/LineageOS/android_frameworks_base/commit/58e177ca589576cacfd1ed016bdd5d0bf4cb9a5d.patch -O android_frameworks_base/345901.patch; #P_asb_2022-12 Fix permanent denial of service via setComponentEnabledSetting
-wget https://github.com/LineageOS/android_frameworks_base/commit/be00f79f1148a27fd9161e65ebaa2eedb7fca4c7.patch -O android_frameworks_base/345902.patch; #P_asb_2022-12 Add safety checks on KEY_INTENT mismatch.
-wget https://github.com/LineageOS/android_frameworks_minikin/commit/4f583889fcc90883fa3ec86befa20c671ec8774e.patch -O android_frameworks_minikin/345903.patch; #P_asb_2022-12 Fix OOB read for registerLocaleList
-wget https://github.com/LineageOS/android_frameworks_minikin/commit/89b513681269399b4d2621f0c1750daa48f77681.patch -O android_frameworks_minikin/345904.patch; #P_asb_2022-12 Fix OOB crash for registerLocaleList
-wget https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/f7624d5f831e8576a816feaebb120974e54c23b6.patch -O android_packages_apps_Bluetooth/345907.patch; #P_asb_2022-12 Fix URI check in BluetoothOppUtility.java
-wget https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/c6cd624a87b1b8f586ef83b2a810c36669b55a0b.patch -O android_packages_apps_EmergencyInfo/345908.patch; #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-wget https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/d25bc7d14e791a049698ac2c7cbd9c72e6e7592d.patch -O android_packages_apps_EmergencyInfo/345909.patch; #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/06242790f0f2b20e1f0caa0548924d1fcddfca93.patch -O android_packages_apps_Settings/345910.patch; #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/090473035dd448e96138844bfec0c88952acf3d1.patch -O android_packages_apps_Settings/345911.patch; #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/6f9c13de0a620203fe7d6bcdfd6d94c74e22706b.patch -O android_packages_apps_Settings/345912.patch; #P_asb_2022-12 Add FLAG_SECURE for ChooseLockPassword and Pattern
-wget https://github.com/LineageOS/android_external_dtc/commit/77e6d383cde91d7ac8bbb159de215ec198e9f1aa.patch -O android_external_dtc/345891.patch; #P_asb_2022-12 libfdt: fdt_path_offset_namelen: Reject empty paths
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/fae9a71b822b913e7516333484e8efd513e1640d.patch -O android_packages_services_Telecomm/345913.patch; #P_asb_2022-12 Hide overlay windows when showing phone account enable/disable screen.
-wget https://github.com/LineageOS/android_system_bt/commit/210fe2c41c04d50c7a82a6415d7708ff5d055b3e.patch -O android_system_bt/345914.patch; #P_asb_2022-12 Add length check when copy AVDTP packet
-wget https://github.com/LineageOS/android_frameworks_base/commit/7f7b42f83fd7aef7570450b82c5931aa81f1e66d.patch -O android_frameworks_base/347044.patch; #P_asb_2023-01 Limit lengths of fields in Condition to a max length.
-wget https://github.com/LineageOS/android_frameworks_base/commit/91726ddbd32c8b5226991492354f1d93616c6cfd.patch -O android_frameworks_base/347045.patch; #P_asb_2023-01 Disable all A11yServices from an uninstalled package.
-wget https://github.com/LineageOS/android_frameworks_base/commit/2dc4e2467dcebfc827d68f573570cd04e6ea6244.patch -O android_frameworks_base/347046.patch; #P_asb_2023-01 Fix conditionId string trimming in AutomaticZenRule
-wget https://github.com/LineageOS/android_frameworks_base/commit/9b5407d68859e615a2ee7a229f486fc5365682da.patch -O android_frameworks_base/347047.patch; #P_asb_2023-01 [SettingsProvider] mem limit should be checked before settings are updated
-wget https://github.com/LineageOS/android_frameworks_base/commit/66a9e8fc457e7257b78dfef3f18eab01c63efc12.patch -O android_frameworks_base/347048.patch; #P_asb_2023-01 Revert "Revert "Validate permission tree size..."
-wget https://github.com/LineageOS/android_frameworks_base/commit/c8892a45db45ee79085b0ee620b3d8f69f560d03.patch -O android_frameworks_base/347049.patch; #P_asb_2023-01 [SettingsProvider] key size limit for mutating settings
-wget https://github.com/LineageOS/android_frameworks_base/commit/9e7745eeedc6066e91e0c508d49c8db15a8ae6bf.patch -O android_frameworks_base/347050.patch; #P_asb_2023-01 Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23
-wget https://github.com/LineageOS/android_frameworks_base/commit/be4c10b9f70b5033bc6f75649265a12f65ad0bc3.patch -O android_frameworks_base/347051.patch; #P_asb_2023-01 Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed.
-wget https://github.com/LineageOS/android_packages_services_Telephony/commit/d596467cc3b161beca194ce4c8f96efcd0d6a340.patch -O android_packages_services_Telephony/347041.patch; #P_asb_2023-01 prevent overlays on the phone settings
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/7636df9f0dcff2d9b272f925b956348fc8dc384b.patch -O android_packages_services_Telecomm/347042.patch; #P_asb_2023-01 Fix security vulnerability when register phone accounts.
-wget https://github.com/LineageOS/android_packages_apps_Nfc/commit/48b3f34578cd9757a11c1cd694527b45c5915ae8.patch -O android_packages_apps_Nfc/347043.patch; #P_asb_2023-01 OOBW in Mfc_Transceive()
-wget https://github.com/LineageOS/android_system_bt/commit/deb080bb11eadef601ec11633317090f060e50bb.patch -O android_system_bt/347127.patch; #P_asb_2023-01 BT: Once AT command is retrieved, return from method.
-wget https://github.com/LineageOS/android_system_bt/commit/0c74f58652259adde281b7d8b13732a8f0e9ab92.patch -O android_system_bt/347128.patch; #P_asb_2023-01 AVRC: Validating msg size before accessing fields
-wget https://github.com/LineageOS/android_frameworks_base/commit/a9d49368cb13ba9d98af67ae9a96b82ae7fc4e46.patch -O android_frameworks_base/349330.patch; #P_asb_2023-02 Correct the behavior of ACTION_PACKAGE_DATA_CLEARED
-wget https://github.com/LineageOS/android_frameworks_base/commit/7780547c156f34020ba7316e8c8cbea6c7985818.patch -O android_frameworks_base/349331.patch; #P_asb_2023-02 Convert argument to intent in ChooseTypeAndAccountActivity
-wget https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/90e0fb025afa7bfe3600b79c2e0e563b5d6124bb.patch -O android_packages_apps_Bluetooth/349332.patch; #P_asb_2023-02 Fix OPP comparison
-wget https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/eeb60967a52197d04d331b8e87beb5f1fb9e92aa.patch -O android_packages_apps_EmergencyInfo/349333.patch; #P_asb_2023-02 Removes unnecessary permission from the EmergencyInfo app.
-wget https://github.com/LineageOS/android_system_bt/commit/12b2d2eeb63246e85e30389d2e885608e9209cc1.patch -O android_system_bt/349334.patch; #P_asb_2023-02 Report failure when not able to connect to AVRCP
-wget https://github.com/LineageOS/android_system_bt/commit/8e81bb1e80ccbba0724e12dabac61b9ac36d4b0f.patch -O android_system_bt/349335.patch; #P_asb_2023-02 Add bounds check in avdt_scb_act.cc
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_packages_apps_Nfc/commit/35299f9e605257a17257c5da0064c3f7cc3dce4a.patch -O android_vendor_nxp_opensource_packages_apps_Nfc/349336.patch; #P_asb_2023-02 OOBW in phNciNfc_MfCreateXchgDataHdr
-wget https://github.com/LineageOS/android_external_expat/commit/281fc3aeb520277460014a8c398ba083d167f284.patch -O android_external_expat/349328.patch; #P_asb_2023-02 [CVE-2022-43680] Fix overeager DTD destruction (fixes
-wget https://github.com/LineageOS/android_frameworks_av/commit/994d95501928153cb7b8f04587e3160bc17ce2a5.patch -O android_frameworks_av/349329.patch; #P_asb_2023-02 move MediaCodec metrics processing to looper thread
-wget https://github.com/LineageOS/android_external_zlib/commit/d6e0dec5307a69aa6381246221803bdc050e5b96.patch -O android_external_zlib/351909.patch; #P_asb_2023-03 Fix a bug when getting a gzip header extra field with inflate().
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/5f84b1609065c5b26f2b5278d83fdd791597a69f.patch -O android_packages_apps_Settings/351914.patch; #P_asb_2023-03 FRP bypass defense in the settings app
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/718126925dc2e00c268f49d006231eb3edd5778a.patch -O android_packages_apps_Settings/351915.patch; #P_asb_2023-03 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
-wget https://github.com/LineageOS/android_system_bt/commit/b7dfbbdf4dc9ae5761816ad0a4875d46244ed25a.patch -O android_system_bt/351916.patch; #P_asb_2023-03 Fix an OOB Write bug in gatt_check_write_long_terminate
-wget https://github.com/LineageOS/android_system_bt/commit/b433704453d59946be0f5b30346cf0dd3e42ec09.patch -O android_system_bt/351917.patch; #P_asb_2023-03 Fix an OOB access bug in A2DP_BuildMediaPayloadHeaderSbc
-wget https://github.com/LineageOS/android_system_bt/commit/fcd19451fa2e3da35c3e0f5db0961b994ed1b49f.patch -O android_system_bt/351918.patch; #P_asb_2023-03 Fix an OOB write in SDP_AddAttribute
-wget https://github.com/LineageOS/android_frameworks_base/commit/3f8c0e9c4ad48b37c44e132a7a8e3fd157a83e00.patch -O android_frameworks_base/351910.patch; #P_asb_2023-03 Move service initialization
-wget https://github.com/LineageOS/android_frameworks_base/commit/11c799795be7c8bafedbc4eb3d940b4a1f93a308.patch -O android_frameworks_base/351911.patch; #P_asb_2023-03 Enable user graularity for lockdown mode
-wget https://github.com/LineageOS/android_frameworks_base/commit/d6401e37da9afb99f647b09fd3ce9aa38bb84016.patch -O android_frameworks_base/351912.patch; #P_asb_2023-03 Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag
-wget https://github.com/LineageOS/android_frameworks_base/commit/7d63c11542c202467f035e03644962a263cfdc19.patch -O android_frameworks_base/351913.patch; #P_asb_2023-03 Reconcile WorkSource parcel and unparcel code.
-wget https://github.com/LineageOS/android_frameworks_base/commit/7ed39484667b94b738b7d1d7717ef5b640a7a405.patch -O android_frameworks_base/354243.patch; #P_asb_2023-04 Checking if package belongs to UID before registering broadcast receiver
-wget https://github.com/LineageOS/android_frameworks_base/commit/34184bc31e77a8db5b967ca275f6e4841bd5e3ff.patch -O android_frameworks_base/354244.patch; #P_asb_2023-04 Fix checkKeyIntentParceledCorrectly's bypass
-wget https://github.com/LineageOS/android_frameworks_base/commit/9cade5349e44f2b48ed6408e3b05a1272ff2a3ef.patch -O android_frameworks_base/354245.patch; #P_asb_2023-04 Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE
-wget https://github.com/LineageOS/android_frameworks_base/commit/1dc0540d7b8918a6043c0863b2bea0946b100b8e.patch -O android_frameworks_base/354242.patch; #P_asb_2023-04 Context#startInstrumentation could be started from SHELL only now.
-wget https://github.com/LineageOS/android_system_bt/commit/a883a17a9e05d87bfb1547d8b812522c771c971c.patch -O android_system_bt/354246.patch; #P_asb_2023-04 Fix OOB access in avdt_scb_hdl_pkt_no_frag
-wget https://github.com/LineageOS/android_system_bt/commit/d9472b7fba9c3a366e768ff4c28225d264aa6ad1.patch -O android_system_bt/354247.patch; #P_asb_2023-04 Fix an OOB bug in register_notification_rsp
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/5ad6edf34e69b9bd0334bb0b0a3592b8d5ded5b4.patch -O android_vendor_nxp_opensource_external_libnfc-nci/354249.patch; #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-wget https://github.com/LineageOS/android_system_nfc/commit/d751463856e968430d4859a55a97f12b2553de19.patch -O android_system_nfc/354248.patch; #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/ffd36f517fae838fe836d6f189b2de6355e6814c.patch -O android_packages_services_Telecomm/356150.patch; #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-wget https://github.com/LineageOS/android_frameworks_native/commit/09ece8aee9246ba8ef5408e074165c9bbc2d6bc1.patch -O android_frameworks_native/356151.patch; #P_asb_2023-05 Check for malformed Sensor Flattenable
-wget https://github.com/LineageOS/android_frameworks_native/commit/c62382dd2192444ca7a81a0318521b03e852c355.patch -O android_frameworks_native/356152.patch; #P_asb_2023-05 Remove some new memory leaks from SensorManager
-wget https://github.com/LineageOS/android_frameworks_native/commit/30348a31e1c0eb604f1a2de40b57d734f71cb9e8.patch -O android_frameworks_native/356153.patch; #P_asb_2023-05 Add removeInstanceForPackageMethod to SensorManager
-wget https://github.com/LineageOS/android_frameworks_base/commit/e0f219e675b2a36304db2f163783fe82937c1d41.patch -O android_frameworks_base/356156.patch; #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-wget https://github.com/LineageOS/android_frameworks_base/commit/18025b2a135d7e7063201054b7f4409fe562ee56.patch -O android_frameworks_base/356154.patch; #P_asb_2023-05 Checks if AccessibilityServiceInfo is within parcelable size.
-wget https://github.com/LineageOS/android_frameworks_base/commit/0cfc7a41aa5b741452316b19bc100be58bbe3cc7.patch -O android_frameworks_base/356155.patch; #P_asb_2023-05 Uri: check authority and scheme as part of determining URI path
-wget https://github.com/LineageOS/android_frameworks_av/commit/d4f4cbe1d4eb1e80f64676cb07e84a6409cd095f.patch -O android_frameworks_av/359729.patch; #P_asb_2023-06 Fix NuMediaExtractor::readSampleData buffer Handling
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/ed20a91b473462e14f7cea5dd1b8cbff4d0feab5.patch -O android_packages_apps_Settings/359734.patch; #P_asb_2023-06 Convert argument to intent in AddAccountSettings.
-wget https://github.com/LineageOS/android_packages_apps_TvSettings/commit/3f8f5d733659d15eb78d0a3de97442c1c33259b8.patch -O android_packages_apps_TvSettings/359735.patch; #P_asb_2023-06 Convert argument to intent in addAccount TvSettings.
-wget https://github.com/LineageOS/android_system_bt/commit/5f6f48a784284a9220ae70d9f99d96a25bd3adce.patch -O android_system_bt/359736.patch; #P_asb_2023-06 Prevent use-after-free of HID reports
-wget https://github.com/LineageOS/android_system_bt/commit/969a3c9aba7e8060f1bcf341375263d67fec01d2.patch -O android_system_bt/359737.patch; #P_asb_2023-06 Revert "Revert "Validate buffer length in sdpu_build_uuid_seq""
-wget https://github.com/LineageOS/android_system_bt/commit/d50fdc03f066f2b1bdb3bcb21d627a0e3ac9e268.patch -O android_system_bt/359738.patch; #P_asb_2023-06 Revert "Revert "Fix wrong BR/EDR link key downgrades (P_256->P_192)""
-wget https://github.com/LineageOS/android_frameworks_base/commit/c45ee6ab3ee0b8e4f16cc88d098fb9200b3a109a.patch -O android_frameworks_base/359730.patch; #P_asb_2023-06 Check key intent for selectors and prohibited flags
-wget https://github.com/LineageOS/android_frameworks_base/commit/22bac442d2249f6e02608f9994cf761bfdf90d80.patch -O android_frameworks_base/359731.patch; #P_asb_2023-06 Handle invalid data during job loading.
-wget https://github.com/LineageOS/android_frameworks_base/commit/24a90436bb260a64b427efb98f3aa40f0c27fe32.patch -O android_frameworks_base/359732.patch; #P_asb_2023-06 Allow filtering of services
-wget https://github.com/LineageOS/android_frameworks_base/commit/4974a8613d776dcd0dff6c8950b3dd1a7dbec465.patch -O android_frameworks_base/359733.patch; #P_asb_2023-06 Prevent RemoteViews crashing SystemUi
-wget https://github.com/LineageOS/android_packages_apps_Traceur/commit/43b23418ed73d1b64bb198a79c5825666c95684d.patch -O android_packages_apps_Traceur/378475.patch; #P_asb_2023-06 Update Traceur to check admin user status
-wget https://github.com/LineageOS/android_packages_apps_Traceur/commit/55e506621081e4e092a4434a763561d2a2f0859e.patch -O android_packages_apps_Traceur/378476.patch; #P_asb_2023-06 Add DISALLOW_DEBUGGING_FEATURES check
-wget https://github.com/LineageOS/android_external_freetype/commit/31e8900c4e35a5b82ee19449830c87f8c1593504.patch -O android_external_freetype/361250.patch; #P_asb_2023-07 Cherry-pick two upstream changes
-wget https://github.com/LineageOS/android_system_nfc/commit/6ea4e00c886e05116d1d6058fb4cf40e0ccdb70b.patch -O android_system_nfc/361251.patch; #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-wget https://github.com/LineageOS/android_system_bt/commit/c4a3cf60380376537eefcce41eec053677c7732c.patch -O android_system_bt/361252.patch; #P_asb_2023-07 Fix gatt_end_operation buffer overflow
-wget https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/c2ad40e96300f65c3e16b06eccba282003385956.patch -O android_vendor_nxp_opensource_external_libnfc-nci/361253.patch; #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-wget https://github.com/LineageOS/android_frameworks_base/commit/c1741be24b21788051c95fafb20f889f15c7b8a8.patch -O android_frameworks_base/361254.patch; #P_asb_2023-07 Sanitize VPN label to prevent HTML injection
-wget https://github.com/LineageOS/android_frameworks_base/commit/63ef19bd0f36f043fa72acbb8484cae2e48a07b1.patch -O android_frameworks_base/361256.patch; #P_asb_2023-07 Import translations. DO NOT MERGE ANYWHERE
-wget https://github.com/LineageOS/android_frameworks_base/commit/626a9919d79ad7584e30496f8b990a1a4e20ec40.patch -O android_frameworks_base/361257.patch; #P_asb_2023-07 Dismiss keyguard when simpin auth'd and...
-wget https://github.com/LineageOS/android_frameworks_base/commit/cfab4afce18c49c6abe6e25fce9add4b57bb65e4.patch -O android_frameworks_base/361259.patch; #P_asb_2023-07 Visit URIs in landscape/portrait custom remote views.
-wget https://github.com/LineageOS/android_tools_apksig/commit/011adec1a494974102930bf65a8d2fdfa8b375b5.patch -O android_tools_apksig/361280.patch; #P_asb_2023-07 Create source stamp verifier
-wget https://github.com/LineageOS/android_tools_apksig/commit/9a80527425030dae7f962ab95eda500a720cde47.patch -O android_tools_apksig/361281.patch; #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-wget https://github.com/LineageOS/android_frameworks_base/commit/3f7975447006b2246dd1b8722064ca26e40aae25.patch -O android_frameworks_base/361258.patch; #P_asb_2023-07 Truncate ShortcutInfo Id
-wget https://github.com/LineageOS/android_frameworks_base/commit/68f08d51b66b8336aeec2e01bcfa72ae5fbfb81d.patch -O android_frameworks_base/361255.patch; #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-wget https://github.com/LineageOS/android_external_aac/commit/c263e21d9cd270283c0fabddeb710798b6fe56aa.patch -O android_external_aac/364605.patch; #P_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
-wget https://github.com/LineageOS/android_external_freetype/commit/ef28d3d7460a814efef8174c44fde7aab4341db5.patch -O android_external_freetype/364606.patch; #P_asb_2023-08 Cherrypick following three changes
-wget https://github.com/LineageOS/android_frameworks_base/commit/6adafe39c32f8236e18c57bc834caa88a09ad8cc.patch -O android_frameworks_base/364608.patch; #P_asb_2023-08 Verify URI permissions for notification shortcutIcon.
-wget https://github.com/LineageOS/android_frameworks_base/commit/0b2c705c891a44ac854cb5ec123fb869669ae5fe.patch -O android_frameworks_base/364609.patch; #P_asb_2023-08 On device lockdown, always show the keyguard
-wget https://github.com/LineageOS/android_frameworks_base/commit/84be6e930a60f855a318c41a446b92849b50087a.patch -O android_frameworks_base/364610.patch; #P_asb_2023-08 Ensure policy has no absurdly long strings
-wget https://github.com/LineageOS/android_frameworks_base/commit/aa0fb47602bd6bc95404d5a5468ba4db577c418f.patch -O android_frameworks_base/364611.patch; #P_asb_2023-08 Implement visitUris for RemoteViews ViewGroupActionAdd.
-wget https://github.com/LineageOS/android_frameworks_base/commit/42d2f7a7ac4004754050ddd53f2e5b626ae28c02.patch -O android_frameworks_base/364612.patch; #P_asb_2023-08 Check URIs in notification public version.
-wget https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/8e5a42af29838bd09b62ec199d744c4592258eeb.patch -O android_packages_providers_TelephonyProvider/364616.patch; #P_asb_2023-08 Update file permissions using canonical path
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/6428c62b978aefd829bf4e91493a356c3675e5c0.patch -O android_packages_services_Telecomm/364617.patch; #P_asb_2023-08 Resolve StatusHints image exploit across user.
-wget https://github.com/LineageOS/android_system_ca-certificates/commit/4c6994b1a05d435e40947a7315aae1a128984957.patch -O android_system_ca-certificates/365328.patch; #P_asb_2023-08 Drop TrustCor certificates
-wget https://github.com/LineageOS/android_frameworks_base/commit/19dc7642fe849e85abe886b9340b5dda52e21885.patch -O android_frameworks_base/364607.patch; #P_asb_2023-08 ActivityManager#killBackgroundProcesses can kill caller's own app only
-wget https://github.com/LineageOS/android_frameworks_base/commit/1537cadd2966e0ea2d188cd3e96af6287bb473c6.patch -O android_frameworks_base/364613.patch; #P_asb_2023-08 Verify URI permissions in MediaMetadata
-wget https://github.com/LineageOS/android_frameworks_base/commit/507937f96405b8530f24c7625b5f5f18f7a0df55.patch -O android_frameworks_base/364614.patch; #P_asb_2023-08 Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used
-wget https://github.com/LineageOS/android_frameworks_base/commit/2e64cb078e9e11e8310c0b589a6edd429b9c2f16.patch -O android_frameworks_base/364615.patch; #P_asb_2023-08 Resolve StatusHints image exploit across user.
-wget https://github.com/LineageOS/android_frameworks_av/commit/7e0adcb2073a2549aa901ecc40de254202a1eded.patch -O android_frameworks_av/366126.patch; #P_asb_2023-09 Fix Segv on unknown address error flagged by fuzzer test.
-wget https://github.com/LineageOS/android_frameworks_base/commit/383b016298865df13c1d1ead7049a9c0a73cb973.patch -O android_frameworks_base/366127.patch; #P_asb_2023-09 Forbid granting access to NLSes with too-long component names
-wget https://github.com/LineageOS/android_frameworks_native/commit/4d3c579105e1a98abc2868723928dea280a93076.patch -O android_frameworks_native/366129.patch; #P_asb_2023-09 Allow sensors list to be empty
-wget https://github.com/LineageOS/android_packages_services_Telephony/commit/114c9d5475962cd63ebf8f246c2c2f4a9c7fddf1.patch -O android_packages_services_Telephony/366130.patch; #P_asb_2023-09 Fixed leak of cross user data in multiple settings.
-wget https://github.com/LineageOS/android_system_bt/commit/f9ba876145b612b684f5b966ab524d7b5b7a783c.patch -O android_system_bt/366131.patch; #P_asb_2023-09 Fix an integer overflow bug in avdt_msg_asmbl
-wget https://github.com/LineageOS/android_system_bt/commit/862350fa3b8fc51bcdd8331352f28cd6cac4bf1d.patch -O android_system_bt/366132.patch; #P_asb_2023-09 Fix integer overflow in build_read_multi_rsp
-wget https://github.com/LineageOS/android_system_bt/commit/db6c02ecbc377437585b56c310e2847661dd557c.patch -O android_system_bt/366133.patch; #P_asb_2023-09 Fix potential abort in btu_av_act.cc
-wget https://github.com/LineageOS/android_system_bt/commit/9b06f046f58bd82f9df6592c1a45ade8075608f9.patch -O android_system_bt/366134.patch; #P_asb_2023-09 Fix reliable write.
-wget https://github.com/LineageOS/android_system_bt/commit/9ac8d616f369513b0ef4f466eded252a4511898d.patch -O android_system_bt/366135.patch; #P_asb_2023-09 Fix UAF in gatt_cl.cc
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/acfa0cd4e0551d07fab0511cfb84462e70a48b53.patch -O android_packages_apps_Settings/366136.patch; #P_asb_2023-09 Prevent non-system IME from becoming device admin
-wget https://github.com/LineageOS/android_packages_apps_Trebuchet/commit/0c9ab1418476b9aab2830f5b3f9d4ee7be3714fd.patch -O android_packages_apps_Trebuchet/366137.patch; #P_asb_2023-09 Fix permission issue in legacy shortcut
-wget https://github.com/LineageOS/android_frameworks_base/commit/3f429c322504732c25e1d92bd57fecdd8a7e5d5b.patch -O android_frameworks_base/366128.patch; #P_asb_2023-09 Update AccountManagerService checkKeyIntentParceledCorrectly.
-wget https://github.com/LineageOS/android_frameworks_base/commit/8489bb9206314ce3be439f374704204626bd40ca.patch -O android_frameworks_base/370695.patch; #P_asb_2023-10 Verify URI Permissions in Autofill RemoteViews
-wget https://github.com/LineageOS/android_frameworks_base/commit/aecf51e67aa3b540f86d12164be8d66e12ca47f2.patch -O android_frameworks_base/370697.patch; #P_asb_2023-10 Disallow loading icon from content URI to PipMenu
-wget https://github.com/LineageOS/android_frameworks_base/commit/71c5804bc372c58c4f7a1b01905618cb5edb2dda.patch -O android_frameworks_base/370699.patch; #P_asb_2023-10 Revert "Dismiss keyguard when simpin auth'd and..."
-wget https://github.com/LineageOS/android_packages_apps_Settings/commit/e7401f49ebfc563aa5fcd9aaa9981a235557d1b4.patch -O android_packages_apps_Settings/370700.patch; #P_asb_2023-10 Restrict ApnEditor settings
-wget https://github.com/LineageOS/android_external_libxml2/commit/2bd551871a645e43a75ce6065598d22b89b80a21.patch -O android_external_libxml2/370701.patch; #P_asb_2023-10 malloc-fail: Fix OOB read after xmlRegGetCounter
-wget https://github.com/LineageOS/android_frameworks_base/commit/ae25f45e664b47e74fc9d73bc1b4292e6721dd7a.patch -O android_frameworks_base/370693.patch; #P_asb_2023-10 RingtoneManager: verify default ringtone is audio
-wget https://github.com/LineageOS/android_frameworks_base/commit/7adb3e0e1d591aeabccc5edfa624a591a3428a3d.patch -O android_frameworks_base/370694.patch; #P_asb_2023-10 Do not share key mappings with JNI object
-wget https://github.com/LineageOS/android_frameworks_base/commit/0fb320aef79861cb612fcd48585571f1715616fe.patch -O android_frameworks_base/370696.patch; #P_asb_2023-10 Fix KCM key mapping cloning
-wget https://github.com/LineageOS/android_frameworks_base/commit/48e0cbe76661b6b4c8edb2950a572694947b5641.patch -O android_frameworks_base/370698.patch; #P_asb_2023-10 Fixing DatabaseUtils to detect malformed UTF-16 strings
-wget https://github.com/LineageOS/android_system_ca-certificates/commit/6f06eccd9ef3d37a2d9d52d1c925c3e71f525b14.patch -O android_system_ca-certificates/374916.patch; #P_asb_2023-11 Remove E-Tugra certificates.
-wget https://github.com/LineageOS/android_packages_services_BuiltInPrintService/commit/4302a583e82fa5bd76315077688818e53df98f20.patch -O android_packages_services_BuiltInPrintService/374919.patch; #P_asb_2023-11 Adjust APIs for CUPS 2.3.3
-wget https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/3d07f3a1821c0953d156206e288bb484a0c0f399.patch -O android_packages_providers_TelephonyProvider/374920.patch; #P_asb_2023-11 Block access to sms/mms db from work profile.
-wget https://github.com/LineageOS/android_frameworks_base/commit/e696b2932c41ab89f4910abc5a626c8e9b8d8543.patch -O android_frameworks_base/374921.patch; #P_asb_2023-11 Fix BAL via notification.publicVersion
-wget https://github.com/LineageOS/android_frameworks_av/commit/62ae30fad8c644b492393eb8c1eec2867cc73b07.patch -O android_frameworks_av/374924.patch; #P_asb_2023-11 Fix for heap buffer overflow issue flagged by fuzzer test.
-wget https://github.com/LineageOS/android_external_libcups/commit/383806fb90e7246d31241ab11332f3c0172e2f17.patch -O android_external_libcups/374932.patch; #P_asb_2023-11 Upgrade libcups to v2.3.1
-wget https://github.com/LineageOS/android_external_libcups/commit/af78634c7babca00f4a5b1650b817b36be4e94dd.patch -O android_external_libcups/374933.patch; #P_asb_2023-11 Upgrade libcups to v2.3.3
-wget https://github.com/LineageOS/android_frameworks_base/commit/1c5bf358397ad6a337d375fbc8dba4d98a50eca8.patch -O android_frameworks_base/374922.patch; #P_asb_2023-11 Use type safe API of readParcelableArray
-wget https://github.com/LineageOS/android_frameworks_base/commit/64de82f91e01d8d7d4224c737efe915397a904d2.patch -O android_frameworks_base/374923.patch; #P_asb_2023-11 [SettingsProvider] verify ringtone URI before setting
-wget https://github.com/LineageOS/android_frameworks_av/commit/5e50aa57f52b08f4cb07a6a3f98698f2077a9cbf.patch -O android_frameworks_av/377765.patch; #P_asb_2023-12 httplive: fix use-after-free
-wget https://github.com/LineageOS/android_frameworks_base/commit/73913dfae62f0c93147896ab07232417cff467ee.patch -O android_frameworks_base/377766.patch; #P_asb_2023-12 Visit Uris added by WearableExtender
-wget https://github.com/LineageOS/android_frameworks_base/commit/ac1ed7557b197952a6e00eb36da31e79d7bf78a4.patch -O android_frameworks_base/377769.patch; #P_asb_2023-12 Use readUniqueFileDescriptor in incidentd service
-wget https://github.com/LineageOS/android_frameworks_base/commit/4ca5de2bda12925a28a59a1dffaccba045b0f9cb.patch -O android_frameworks_base/377771.patch; #P_asb_2023-12 Revert "On device lockdown, always show the keyguard"
-wget https://github.com/LineageOS/android_frameworks_base/commit/059ed6a3d856caee5896d94d9ea26f90c6117c93.patch -O android_frameworks_base/377773.patch; #P_asb_2023-12 Updated: always show the keyguard on device lockdown
-wget https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/3b53fae30442369bda8cd858f5b0ac697b9cd4ec.patch -O android_packages_apps_Bluetooth/377774.patch; #P_asb_2023-12 Fix UAF in ~CallbackEnv
-wget https://github.com/LineageOS/android_packages_apps_Trebuchet/commit/02e99b157f05f8fbabb9c2457e387842ccad0bed.patch -O android_packages_apps_Trebuchet/377775.patch; #P_asb_2023-12 Fix permission bypass in legacy shortcut
-wget https://github.com/LineageOS/android_packages_services_Telecomm/commit/7ef90cb74da31eb165fc624f479b02cf6df2ebda.patch -O android_packages_services_Telecomm/377776.patch; #P_asb_2023-12 Resolve account image icon profile boundary exploit.
-wget https://github.com/LineageOS/android_system_bt/commit/26fe8da32584d6f639124e3ca8a7cbdbe5c60d89.patch -O android_system_bt/377777.patch; #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [1]
-wget https://github.com/LineageOS/android_system_bt/commit/6b208d0624e05bb96bffbca43e18a03dc37d21dd.patch -O android_system_bt/377778.patch; #P_asb_2023-12 Reject access to secure services authenticated from temp bonding [2]
-wget https://github.com/LineageOS/android_system_bt/commit/66a09ccfd76de30e03a843df140d7851be013052.patch -O android_system_bt/377779.patch; #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [3]
-wget https://github.com/LineageOS/android_system_bt/commit/95161565e5bf426333102097a92a8f654c10e74a.patch -O android_system_bt/377780.patch; #P_asb_2023-12 Reorganize the code for checking auth requirement
-wget https://github.com/LineageOS/android_system_bt/commit/037c9934224eabab778ee4cc197a46b64396633c.patch -O android_system_bt/377781.patch; #P_asb_2023-12Enforce authentication if encryption is required
-wget https://github.com/LineageOS/android_system_bt/commit/80a300fa626f6c5e8e7a595469f09adc307aee40.patch -O android_system_bt/377782.patch; #P_asb_2023-12 Fix timing attack in BTM_BleVerifySignature
-wget https://github.com/LineageOS/android_frameworks_base/commit/c78cee7f1c921860ac3253812548f46663383a37.patch -O android_frameworks_base/377767.patch; #P_asb_2023-12 Drop invalid data.
-wget https://github.com/LineageOS/android_frameworks_base/commit/c58b86b918ab7085f17215883cc110ca3362235f.patch -O android_frameworks_base/377768.patch; #P_asb_2023-12 Require permission to unlock keyguard
-wget https://github.com/LineageOS/android_frameworks_base/commit/b18f4518109c2f7a4c936321db87f5245b3143f3.patch -O android_frameworks_base/377770.patch; #P_asb_2023-12 Validate userId when publishing shortcuts
-wget https://github.com/LineageOS/android_frameworks_base/commit/98fc501deb893768aeff55006ce445f688a88203.patch -O android_frameworks_base/377772.patch; #P_asb_2023-12 Adding in verification of calling UID in onShellCommand
-wget https://github.com/LineageOS/android_system_netd/commit/02458b0a19ce2d3214a00f9779bd36868541b7ca.patch -O android_system_netd/378480.patch; #P_asb_2023-12 Fix Heap-use-after-free in MDnsSdListener::Monitor::run
-wget https://github.com/LineageOS/android_frameworks_av/commit/978191d5fc0ede5bc11b8af2cfa2469a30ad919d.patch -O android_frameworks_av/379788.patch; #P_asb_2024-01 Fix convertYUV420Planar16ToY410 overflow issue for unsupported cropwidth.
-wget https://github.com/LineageOS/android_frameworks_base/commit/44ce07024742aaae46a7191cd15e5ac68d209049.patch -O android_frameworks_base/379789.patch; #P_asb_2024-01 Dismiss keyguard when simpin auth'd and...
-wget https://github.com/LineageOS/android_frameworks_base/commit/63e443bfb107da3df0e37863e34c4b947052a6c1.patch -O android_frameworks_base/379790.patch; #P_asb_2024-01 Ensure finish lockscreen when usersetup incomplete
-wget https://github.com/LineageOS/android_frameworks_base/commit/70f50825ec98cd35d38e45eea69aa7ed8f51556a.patch -O android_frameworks_base/379791.patch; #P_asb_2024-01 Truncate user data to a limit of 500 characters
-wget https://github.com/LineageOS/android_frameworks_base/commit/9001132c18c0eb2a6478939e1bdbbe6778af1ae3.patch -O android_frameworks_base/379792.patch; #P_asb_2024-01 Validate component name length before requesting notification access.
-wget https://github.com/LineageOS/android_frameworks_base/commit/1cf5c05eaaff574e8dceb0c1a75ad02d0c669891.patch -O android_frameworks_base/379793.patch; #P_asb_2024-01 Log to detect usage of whitelistToken when sending non-PI target
-wget https://github.com/LineageOS/android_frameworks_base/commit/5948fb2aef0547db38f2f9df47b6fad736ba72b0.patch -O android_frameworks_base/379794.patch; #P_asb_2024-01 Fix vulnerability that allowed attackers to start arbitary activities
-wget https://github.com/LineageOS/android_system_bt/commit/e65eb2fdab8644f2e7885a628f6af9244ceed813.patch -O android_system_bt/379796.patch; #P_asb_2024-01 Fix some OOB errors in BTM parsing
-wget https://github.com/LineageOS/android_frameworks_base/commit/309033664a4fbb6200b3fe48d33e8f63becee810.patch -O android_frameworks_base/379980.patch; #P_asb_2024-01 Fix ActivityManager#killBackgroundProcesses permissions
-wget https://github.com/LineageOS/android_frameworks_av/commit/a42e0fc335d448e646309745a8d412d984748479.patch -O android_frameworks_av/383562.patch; #P_asb_2024-02 Update mtp packet buffer
-wget https://github.com/LineageOS/android_frameworks_base/commit/6f5e6f86263c3db753c6d58f516070a45e30b619.patch -O android_frameworks_base/383563.patch; #P_asb_2024-02 Unbind TileService onNullBinding
-wget https://github.com/LineageOS/android_system_bt/commit/14e35c7cf40595a6b1ff1d2e92f8b53fb356b3dc.patch -O android_system_bt/383565.patch; #P_asb_2024-02 Fix an OOB bug in btif_to_bta_response and attp_build_value_cmd
-wget https://github.com/LineageOS/android_system_bt/commit/37ce9a968b579a87640d40e50ec91abe04101f3c.patch -O android_system_bt/383566.patch; #P_asb_2024-02 Fix an OOB write bug in attp_build_read_by_type_value_cmd
-wget https://github.com/LineageOS/android_packages_providers_DownloadProvider/commit/d1a6862647428e9c973f4c21adc83656c5ac98f9.patch -O android_packages_providers_DownloadProvider/383567.patch; #P_asb_2024-02 Consolidate queryChildDocumentsXxx() implementations
-wget https://github.com/LineageOS/android_frameworks_av/commit/cc12a31fcbd0deddd5a74b7be121baf835ecf6dc.patch -O android_frameworks_av/385670.patch; #P_asb_2024-03 Validate OMX Params for VPx encoders
-wget https://github.com/LineageOS/android_frameworks_av/commit/ed62ccd9520a671d2fb900d236f5bc5ad16a1e7c.patch -O android_frameworks_av/385671.patch; #P_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue
-wget https://github.com/LineageOS/android_frameworks_base/commit/0254ee96d60cd80a52ce583c90486d6ca1549fb6.patch -O android_frameworks_base/385672.patch; #P_asb_2024-03 Resolve custom printer icon boundary exploit.
-wget https://github.com/LineageOS/android_frameworks_base/commit/3cbbcd611ff83ef7a0f811d04f0478f2760ae891.patch -O android_frameworks_base/385673.patch; #P_asb_2024-03 Disallow system apps to be installed/updated as instant.
-wget https://github.com/LineageOS/android_frameworks_base/commit/8befe29745f94a8d80f59f0d644315c5424c8eb6.patch -O android_frameworks_base/385674.patch; #P_asb_2024-03 Close AccountManagerService.session after timeout.
-wget https://github.com/LineageOS/android_system_bt/commit/fbf12851fa55267f8b654f0cd1337f9f98f83c4b.patch -O android_system_bt/385675.patch; #P_asb_2024-03 Fix OOB caused by invalid SMP packet length
-wget https://github.com/LineageOS/android_system_bt/commit/73c18d6ce8333f787a4cedb24d247b071bdbf078.patch -O android_system_bt/385676.patch; #P_asb_2024-03 Fix an OOB bug in smp_proc_sec_req
-wget https://github.com/LineageOS/android_system_bt/commit/42ede61231b6b1a507cbc254827ff10dd5ae8c20.patch -O android_system_bt/385677.patch; #P_asb_2024-03 Reland: Fix an OOB write bug in attp_build_value_cmd
-wget https://github.com/LineageOS/android_system_bt/commit/3683c921ab4afd4f2f6bef8a49cbfda227ce081f.patch -O android_system_bt/385678.patch; #P_asb_2024-03 Fix a security bypass issue in access_secure_service_from_temp_bond
-wget https://github.com/LineageOS/android_frameworks_base/commit/e3d632959e2606a909427e4f717cd3a6cc14d4c6.patch -O android_frameworks_base/389269.patch; #P_asb_2024-04 isUserInLockDown can be true when there are other strong auth requirements
-wget https://github.com/LineageOS/android_frameworks_base/commit/1010f9aae741c4b5e8400709a273910b9818f4ba.patch -O android_frameworks_base/389270.patch; #P_asb_2024-04 Fix security vulnerability that creates user with no restrictions when accountOptions are too long.
diff --git a/Misc/pick-imports/16-asbs-patch.sh b/Misc/pick-imports/16-asbs-patch.sh
deleted file mode 100644
index 5ee1670b..00000000
--- a/Misc/pick-imports/16-asbs-patch.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-applyPatch "$DOS_PATCHES/android_external_aac/332775.patch"; #P_asb_2022-06 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
-applyPatch "$DOS_PATCHES/android_external_aac/364605.patch"; #P_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
-applyPatch "$DOS_PATCHES/android_external_dtc/342096.patch"; #P_asb_2022-10 libfdt: fdt_offset_ptr(): Fix comparison warnings
-applyPatch "$DOS_PATCHES/android_external_dtc/344161.patch"; #P_asb_2022-11 Fix integer wrap sanitisation.
-applyPatch "$DOS_PATCHES/android_external_dtc/345891.patch"; #P_asb_2022-12 libfdt: fdt_path_offset_namelen: Reject empty paths
-applyPatch "$DOS_PATCHES/android_external_expat/338353.patch"; #P_asb_2022-09 Prevent integer overflow in copyString
-applyPatch "$DOS_PATCHES/android_external_expat/338354.patch"; #P_asb_2022-09 Prevent XML_GetBuffer signed integer overflow
-applyPatch "$DOS_PATCHES/android_external_expat/338355.patch"; #P_asb_2022-09 Prevent integer overflow in function doProlog
-applyPatch "$DOS_PATCHES/android_external_expat/338356.patch"; #P_asb_2022-09 Prevent more integer overflows
-applyPatch "$DOS_PATCHES/android_external_expat/349328.patch"; #P_asb_2023-02 [CVE-2022-43680] Fix overeager DTD destruction (fixes
-applyPatch "$DOS_PATCHES/android_external_freetype/361250.patch"; #P_asb_2023-07 Cherry-pick two upstream changes
-applyPatch "$DOS_PATCHES/android_external_freetype/364606.patch"; #P_asb_2023-08 Cherrypick following three changes
-applyPatch "$DOS_PATCHES/android_external_libcups/374932.patch"; #P_asb_2023-11 Upgrade libcups to v2.3.1
-applyPatch "$DOS_PATCHES/android_external_libcups/374933.patch"; #P_asb_2023-11 Upgrade libcups to v2.3.3
-applyPatch "$DOS_PATCHES/android_external_libxml2/370701.patch"; #P_asb_2023-10 malloc-fail: Fix OOB read after xmlRegGetCounter
-applyPatch "$DOS_PATCHES/android_external_zlib/351909.patch"; #P_asb_2023-03 Fix a bug when getting a gzip header extra field with inflate().
-applyPatch "$DOS_PATCHES/android_frameworks_av/344167.patch"; #P_asb_2022-11 setSecurityLevel in clearkey
-applyPatch "$DOS_PATCHES/android_frameworks_av/349329.patch"; #P_asb_2023-02 move MediaCodec metrics processing to looper thread
-applyPatch "$DOS_PATCHES/android_frameworks_av/359729.patch"; #P_asb_2023-06 Fix NuMediaExtractor::readSampleData buffer Handling
-applyPatch "$DOS_PATCHES/android_frameworks_av/366126.patch"; #P_asb_2023-09 Fix Segv on unknown address error flagged by fuzzer test.
-applyPatch "$DOS_PATCHES/android_frameworks_av/374924.patch"; #P_asb_2023-11 Fix for heap buffer overflow issue flagged by fuzzer test.
-applyPatch "$DOS_PATCHES/android_frameworks_av/377765.patch"; #P_asb_2023-12 httplive: fix use-after-free
-applyPatch "$DOS_PATCHES/android_frameworks_av/379788.patch"; #P_asb_2024-01 Fix convertYUV420Planar16ToY410 overflow issue for unsupported cropwidth.
-applyPatch "$DOS_PATCHES/android_frameworks_av/383562.patch"; #P_asb_2024-02 Update mtp packet buffer
-applyPatch "$DOS_PATCHES/android_frameworks_av/385670.patch"; #P_asb_2024-03 Validate OMX Params for VPx encoders
-applyPatch "$DOS_PATCHES/android_frameworks_av/385671.patch"; #P_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue
-applyPatch "$DOS_PATCHES/android_frameworks_base/330961.patch"; #P_asb_2022-05 Keyguard - Treat messsages to lock with priority
-applyPatch "$DOS_PATCHES/android_frameworks_base/330962.patch"; #P_asb_2022-05 Verify caller before auto granting slice permission
-applyPatch "$DOS_PATCHES/android_frameworks_base/330963.patch"; #P_asb_2022-05 Always restart apps if base.apk gets updated.
-applyPatch "$DOS_PATCHES/android_frameworks_base/332756.patch"; #P_asb_2022-06 Add finalizeWorkProfileProvisioning.
-applyPatch "$DOS_PATCHES/android_frameworks_base/332757.patch"; #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10; api doc update
-applyPatch "$DOS_PATCHES/android_frameworks_base/332776.patch"; #P_asb_2022-06 Update GeofenceHardwareRequestParcelable to match parcel/unparcel format.
-applyPatch "$DOS_PATCHES/android_frameworks_base/332777.patch"; #P_asb_2022-06 Add an OEM configurable limit for zen rules
-applyPatch "$DOS_PATCHES/android_frameworks_base/332778.patch"; #P_asb_2022-06 Fix security hole in GateKeeperResponse
-applyPatch "$DOS_PATCHES/android_frameworks_base/332779.patch"; #P_asb_2022-06 Prevent non-admin users from deleting system apps.
-applyPatch "$DOS_PATCHES/android_frameworks_base/334256.patch"; #P_asb_2022-07 StorageManagerService: don't ignore failures to prepare user storage
-applyPatch "$DOS_PATCHES/android_frameworks_base/334257.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery if preparing user storage fails
-applyPatch "$DOS_PATCHES/android_frameworks_base/334258.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery for system user only
-applyPatch "$DOS_PATCHES/android_frameworks_base/334259.patch"; #P_asb_2022-07 Ignore errors preparing user storage for existing users
-applyPatch "$DOS_PATCHES/android_frameworks_base/334260.patch"; #P_asb_2022-07 Log to EventLog on prepareUserStorage failure
-applyPatch "$DOS_PATCHES/android_frameworks_base/334262.patch"; #P_asb_2022-07 Crash invalid FGS notifications
-applyPatch "$DOS_PATCHES/android_frameworks_base/335117.patch"; #P_asb_2022-08 Only allow system and same app to apply relinquishTaskIdentity
-applyPatch "$DOS_PATCHES/android_frameworks_base/335118.patch"; #P_asb_2022-08 Suppress notifications when device enter lockdown
-applyPatch "$DOS_PATCHES/android_frameworks_base/335119.patch"; #P_asb_2022-08 Remove package title from notification access confirmation intent
-applyPatch "$DOS_PATCHES/android_frameworks_base/335120.patch"; #P_asb_2022-08 Stop using invalid URL to prevent unexpected crash
-applyPatch "$DOS_PATCHES/android_frameworks_base/335121.patch"; #P_asb_2022-08 Only allow the system server to connect to sync adapters
-applyPatch "$DOS_PATCHES/android_frameworks_base/338346.patch"; #P_asb_2022-09 Fix duplicate permission privilege escalation
-applyPatch "$DOS_PATCHES/android_frameworks_base/338347.patch"; #P_asb_2022-09 Parcel: recycle recycles
-applyPatch "$DOS_PATCHES/android_frameworks_base/338348.patch"; #P_asb_2022-09 IMMS: Make IMMS PendingIntents immutable
-applyPatch "$DOS_PATCHES/android_frameworks_base/338349.patch"; #P_asb_2022-09 Remove package name from SafetyNet logs
-applyPatch "$DOS_PATCHES/android_frameworks_base/342100.patch"; #P_asb_2022-10 Limit the number of concurrently snoozed notifications
-applyPatch "$DOS_PATCHES/android_frameworks_base/344168.patch"; #P_asb_2022-11 Move accountname and typeName length check from Account.java to AccountManagerService.
-applyPatch "$DOS_PATCHES/android_frameworks_base/344169.patch"; #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-applyPatch "$DOS_PATCHES/android_frameworks_base/344170.patch"; #P_asb_2022-11 Do not send new Intent to non-exported activity when navigateUpTo
-applyPatch "$DOS_PATCHES/android_frameworks_base/344171.patch"; #P_asb_2022-11 Do not send AccessibilityEvent if notification is for different user.
-applyPatch "$DOS_PATCHES/android_frameworks_base/344172.patch"; #P_asb_2022-11 Trim any long string inputs that come in to AutomaticZenRule
-applyPatch "$DOS_PATCHES/android_frameworks_base/344173.patch"; #P_asb_2022-11 Check permission for VoiceInteraction
-applyPatch "$DOS_PATCHES/android_frameworks_base/344174.patch"; #P_asb_2022-11 Do not dismiss keyguard after SIM PUK unlock
-applyPatch "$DOS_PATCHES/android_frameworks_base/345892.patch"; #P_asb_2022-12 Revert "Prevent non-admin users from deleting system apps."
-applyPatch "$DOS_PATCHES/android_frameworks_base/345893.patch"; #P_asb_2022-12 Limit the size of NotificationChannel and NotificationChannelGroup
-applyPatch "$DOS_PATCHES/android_frameworks_base/345894.patch"; #P_asb_2022-12 Prevent non-admin users from deleting system apps.
-applyPatch "$DOS_PATCHES/android_frameworks_base/345895.patch"; #P_asb_2022-12 Validate package name passed to setApplicationRestrictions.
-applyPatch "$DOS_PATCHES/android_frameworks_base/345896.patch"; #P_asb_2022-12 Include all enabled services when FEEDBACK_ALL_MASK.
-applyPatch "$DOS_PATCHES/android_frameworks_base/345897.patch"; #P_asb_2022-12 [pm] forbid deletion of protected packages
-applyPatch "$DOS_PATCHES/android_frameworks_base/345898.patch"; #P_asb_2022-12 Fix NPE
-applyPatch "$DOS_PATCHES/android_frameworks_base/345899.patch"; #P_asb_2022-12 Fix a security issue in app widget service.
-applyPatch "$DOS_PATCHES/android_frameworks_base/345900.patch"; #P_asb_2022-12 Ignore malformed shortcuts
-applyPatch "$DOS_PATCHES/android_frameworks_base/345901.patch"; #P_asb_2022-12 Fix permanent denial of service via setComponentEnabledSetting
-applyPatch "$DOS_PATCHES/android_frameworks_base/345902.patch"; #P_asb_2022-12 Add safety checks on KEY_INTENT mismatch.
-applyPatch "$DOS_PATCHES/android_frameworks_base/347044.patch"; #P_asb_2023-01 Limit lengths of fields in Condition to a max length.
-applyPatch "$DOS_PATCHES/android_frameworks_base/347045.patch"; #P_asb_2023-01 Disable all A11yServices from an uninstalled package.
-applyPatch "$DOS_PATCHES/android_frameworks_base/347046.patch"; #P_asb_2023-01 Fix conditionId string trimming in AutomaticZenRule
-applyPatch "$DOS_PATCHES/android_frameworks_base/347047.patch"; #P_asb_2023-01 [SettingsProvider] mem limit should be checked before settings are updated
-applyPatch "$DOS_PATCHES/android_frameworks_base/347048.patch"; #P_asb_2023-01 Revert "Revert "Validate permission tree size..."
-applyPatch "$DOS_PATCHES/android_frameworks_base/347049.patch"; #P_asb_2023-01 [SettingsProvider] key size limit for mutating settings
-applyPatch "$DOS_PATCHES/android_frameworks_base/347050.patch"; #P_asb_2023-01 Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23
-applyPatch "$DOS_PATCHES/android_frameworks_base/347051.patch"; #P_asb_2023-01 Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed.
-applyPatch "$DOS_PATCHES/android_frameworks_base/349330.patch"; #P_asb_2023-02 Correct the behavior of ACTION_PACKAGE_DATA_CLEARED
-applyPatch "$DOS_PATCHES/android_frameworks_base/349331.patch"; #P_asb_2023-02 Convert argument to intent in ChooseTypeAndAccountActivity
-applyPatch "$DOS_PATCHES/android_frameworks_base/351910.patch"; #P_asb_2023-03 Move service initialization
-applyPatch "$DOS_PATCHES/android_frameworks_base/351911.patch"; #P_asb_2023-03 Enable user graularity for lockdown mode
-applyPatch "$DOS_PATCHES/android_frameworks_base/351912.patch"; #P_asb_2023-03 Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag
-applyPatch "$DOS_PATCHES/android_frameworks_base/351913.patch"; #P_asb_2023-03 Reconcile WorkSource parcel and unparcel code.
-applyPatch "$DOS_PATCHES/android_frameworks_base/354242.patch"; #P_asb_2023-04 Context#startInstrumentation could be started from SHELL only now.
-applyPatch "$DOS_PATCHES/android_frameworks_base/354243.patch"; #P_asb_2023-04 Checking if package belongs to UID before registering broadcast receiver
-applyPatch "$DOS_PATCHES/android_frameworks_base/354244.patch"; #P_asb_2023-04 Fix checkKeyIntentParceledCorrectly's bypass
-applyPatch "$DOS_PATCHES/android_frameworks_base/354245.patch"; #P_asb_2023-04 Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE
-applyPatch "$DOS_PATCHES/android_frameworks_base/356154.patch"; #P_asb_2023-05 Checks if AccessibilityServiceInfo is within parcelable size.
-applyPatch "$DOS_PATCHES/android_frameworks_base/356155.patch"; #P_asb_2023-05 Uri: check authority and scheme as part of determining URI path
-applyPatch "$DOS_PATCHES/android_frameworks_base/356156.patch"; #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-applyPatch "$DOS_PATCHES/android_frameworks_base/359730.patch"; #P_asb_2023-06 Check key intent for selectors and prohibited flags
-applyPatch "$DOS_PATCHES/android_frameworks_base/359731.patch"; #P_asb_2023-06 Handle invalid data during job loading.
-applyPatch "$DOS_PATCHES/android_frameworks_base/359732.patch"; #P_asb_2023-06 Allow filtering of services
-applyPatch "$DOS_PATCHES/android_frameworks_base/359733.patch"; #P_asb_2023-06 Prevent RemoteViews crashing SystemUi
-applyPatch "$DOS_PATCHES/android_frameworks_base/361254.patch"; #P_asb_2023-07 Sanitize VPN label to prevent HTML injection
-applyPatch "$DOS_PATCHES/android_frameworks_base/361255.patch"; #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-applyPatch "$DOS_PATCHES/android_frameworks_base/361256.patch"; #P_asb_2023-07 Import translations. DO NOT MERGE ANYWHERE
-applyPatch "$DOS_PATCHES/android_frameworks_base/361257.patch"; #P_asb_2023-07 Dismiss keyguard when simpin auth'd and...
-applyPatch "$DOS_PATCHES/android_frameworks_base/361258.patch"; #P_asb_2023-07 Truncate ShortcutInfo Id
-applyPatch "$DOS_PATCHES/android_frameworks_base/361259.patch"; #P_asb_2023-07 Visit URIs in landscape/portrait custom remote views.
-applyPatch "$DOS_PATCHES/android_frameworks_base/364607.patch"; #P_asb_2023-08 ActivityManager#killBackgroundProcesses can kill caller's own app only
-applyPatch "$DOS_PATCHES/android_frameworks_base/364608.patch"; #P_asb_2023-08 Verify URI permissions for notification shortcutIcon.
-applyPatch "$DOS_PATCHES/android_frameworks_base/364609.patch"; #P_asb_2023-08 On device lockdown, always show the keyguard
-applyPatch "$DOS_PATCHES/android_frameworks_base/364610.patch"; #P_asb_2023-08 Ensure policy has no absurdly long strings
-applyPatch "$DOS_PATCHES/android_frameworks_base/364611.patch"; #P_asb_2023-08 Implement visitUris for RemoteViews ViewGroupActionAdd.
-applyPatch "$DOS_PATCHES/android_frameworks_base/364612.patch"; #P_asb_2023-08 Check URIs in notification public version.
-applyPatch "$DOS_PATCHES/android_frameworks_base/364613.patch"; #P_asb_2023-08 Verify URI permissions in MediaMetadata
-applyPatch "$DOS_PATCHES/android_frameworks_base/364614.patch"; #P_asb_2023-08 Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used
-applyPatch "$DOS_PATCHES/android_frameworks_base/364615.patch"; #P_asb_2023-08 Resolve StatusHints image exploit across user.
-applyPatch "$DOS_PATCHES/android_frameworks_base/366127.patch"; #P_asb_2023-09 Forbid granting access to NLSes with too-long component names
-applyPatch "$DOS_PATCHES/android_frameworks_base/366128.patch"; #P_asb_2023-09 Update AccountManagerService checkKeyIntentParceledCorrectly.
-applyPatch "$DOS_PATCHES/android_frameworks_base/370693.patch"; #P_asb_2023-10 RingtoneManager: verify default ringtone is audio
-applyPatch "$DOS_PATCHES/android_frameworks_base/370694.patch"; #P_asb_2023-10 Do not share key mappings with JNI object
-applyPatch "$DOS_PATCHES/android_frameworks_base/370695.patch"; #P_asb_2023-10 Verify URI Permissions in Autofill RemoteViews
-applyPatch "$DOS_PATCHES/android_frameworks_base/370696.patch"; #P_asb_2023-10 Fix KCM key mapping cloning
-applyPatch "$DOS_PATCHES/android_frameworks_base/370697.patch"; #P_asb_2023-10 Disallow loading icon from content URI to PipMenu
-applyPatch "$DOS_PATCHES/android_frameworks_base/370698.patch"; #P_asb_2023-10 Fixing DatabaseUtils to detect malformed UTF-16 strings
-applyPatch "$DOS_PATCHES/android_frameworks_base/370699.patch"; #P_asb_2023-10 Revert "Dismiss keyguard when simpin auth'd and..."
-applyPatch "$DOS_PATCHES/android_frameworks_base/374921.patch"; #P_asb_2023-11 Fix BAL via notification.publicVersion
-applyPatch "$DOS_PATCHES/android_frameworks_base/374922.patch"; #P_asb_2023-11 Use type safe API of readParcelableArray
-applyPatch "$DOS_PATCHES/android_frameworks_base/374923.patch"; #P_asb_2023-11 [SettingsProvider] verify ringtone URI before setting
-applyPatch "$DOS_PATCHES/android_frameworks_base/377766.patch"; #P_asb_2023-12 Visit Uris added by WearableExtender
-applyPatch "$DOS_PATCHES/android_frameworks_base/377767.patch"; #P_asb_2023-12 Drop invalid data.
-applyPatch "$DOS_PATCHES/android_frameworks_base/377768.patch"; #P_asb_2023-12 Require permission to unlock keyguard
-applyPatch "$DOS_PATCHES/android_frameworks_base/377769.patch"; #P_asb_2023-12 Use readUniqueFileDescriptor in incidentd service
-applyPatch "$DOS_PATCHES/android_frameworks_base/377770.patch"; #P_asb_2023-12 Validate userId when publishing shortcuts
-applyPatch "$DOS_PATCHES/android_frameworks_base/377771.patch"; #P_asb_2023-12 Revert "On device lockdown, always show the keyguard"
-applyPatch "$DOS_PATCHES/android_frameworks_base/377772.patch"; #P_asb_2023-12 Adding in verification of calling UID in onShellCommand
-applyPatch "$DOS_PATCHES/android_frameworks_base/377773.patch"; #P_asb_2023-12 Updated: always show the keyguard on device lockdown
-applyPatch "$DOS_PATCHES/android_frameworks_base/379789.patch"; #P_asb_2024-01 Dismiss keyguard when simpin auth'd and...
-applyPatch "$DOS_PATCHES/android_frameworks_base/379790.patch"; #P_asb_2024-01 Ensure finish lockscreen when usersetup incomplete
-applyPatch "$DOS_PATCHES/android_frameworks_base/379791.patch"; #P_asb_2024-01 Truncate user data to a limit of 500 characters
-applyPatch "$DOS_PATCHES/android_frameworks_base/379792.patch"; #P_asb_2024-01 Validate component name length before requesting notification access.
-applyPatch "$DOS_PATCHES/android_frameworks_base/379793.patch"; #P_asb_2024-01 Log to detect usage of whitelistToken when sending non-PI target
-applyPatch "$DOS_PATCHES/android_frameworks_base/379794.patch"; #P_asb_2024-01 Fix vulnerability that allowed attackers to start arbitary activities
-applyPatch "$DOS_PATCHES/android_frameworks_base/379980.patch"; #P_asb_2024-01 Fix ActivityManager#killBackgroundProcesses permissions
-applyPatch "$DOS_PATCHES/android_frameworks_base/383563.patch"; #P_asb_2024-02 Unbind TileService onNullBinding
-applyPatch "$DOS_PATCHES/android_frameworks_base/385672.patch"; #P_asb_2024-03 Resolve custom printer icon boundary exploit.
-applyPatch "$DOS_PATCHES/android_frameworks_base/385673.patch"; #P_asb_2024-03 Disallow system apps to be installed/updated as instant.
-applyPatch "$DOS_PATCHES/android_frameworks_base/385674.patch"; #P_asb_2024-03 Close AccountManagerService.session after timeout.
-applyPatch "$DOS_PATCHES/android_frameworks_base/389269.patch"; #P_asb_2024-04 isUserInLockDown can be true when there are other strong auth requirements
-applyPatch "$DOS_PATCHES/android_frameworks_base/389270.patch"; #P_asb_2024-04 Fix security vulnerability that creates user with no restrictions when accountOptions are too long.
-applyPatch "$DOS_PATCHES/android_frameworks_minikin/345903.patch"; #P_asb_2022-12 Fix OOB read for registerLocaleList
-applyPatch "$DOS_PATCHES/android_frameworks_minikin/345904.patch"; #P_asb_2022-12 Fix OOB crash for registerLocaleList
-applyPatch "$DOS_PATCHES/android_frameworks_native/356151.patch"; #P_asb_2023-05 Check for malformed Sensor Flattenable
-applyPatch "$DOS_PATCHES/android_frameworks_native/356152.patch"; #P_asb_2023-05 Remove some new memory leaks from SensorManager
-applyPatch "$DOS_PATCHES/android_frameworks_native/356153.patch"; #P_asb_2023-05 Add removeInstanceForPackageMethod to SensorManager
-applyPatch "$DOS_PATCHES/android_frameworks_native/366129.patch"; #P_asb_2023-09 Allow sensors list to be empty
-applyPatch "$DOS_PATCHES/android_frameworks_opt_telephony/334263.patch"; #P_asb_2022-07 Enforce privileged phone state for getSubscriptionProperty(GROUP_UUID)
-applyPatch "$DOS_PATCHES/android_hardware_nxp_nfc/344180.patch"; #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/332758.patch"; #P_asb_2022-06 Removes app access to BluetoothAdapter#setScanMode by requiring BLUETOOTH_PRIVILEGED permission.
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/332759.patch"; #P_asb_2022-06 Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission.
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/345907.patch"; #P_asb_2022-12 Fix URI check in BluetoothOppUtility.java
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/349332.patch"; #P_asb_2023-02 Fix OPP comparison
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/377774.patch"; #P_asb_2023-12 Fix UAF in ~CallbackEnv
-applyPatch "$DOS_PATCHES/android_packages_apps_Contacts/332760.patch"; #P_asb_2022-06 No longer export CallSubjectDialog
-applyPatch "$DOS_PATCHES/android_packages_apps_Dialer/332761.patch"; #P_asb_2022-06 No longer export CallSubjectDialog
-applyPatch "$DOS_PATCHES/android_packages_apps_EmergencyInfo/342101.patch"; #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-applyPatch "$DOS_PATCHES/android_packages_apps_EmergencyInfo/345908.patch"; #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-applyPatch "$DOS_PATCHES/android_packages_apps_EmergencyInfo/345909.patch"; #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-applyPatch "$DOS_PATCHES/android_packages_apps_EmergencyInfo/349333.patch"; #P_asb_2023-02 Removes unnecessary permission from the EmergencyInfo app.
-applyPatch "$DOS_PATCHES/android_packages_apps_KeyChain/334264.patch"; #P_asb_2022-07 Encode authority part of uri before showing in UI
-applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/332762.patch"; #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/347043.patch"; #P_asb_2023-01 OOBW in Mfc_Transceive()
-applyPatch "$DOS_PATCHES/android_packages_apps_PackageInstaller/344181.patch"; #P_asb_2022-11 Hide overlays on ReviewPermissionsAtivity
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/330960.patch"; #P_asb_2022-05 Hide private DNS settings UI in Guest mode
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/332763.patch"; #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/334265.patch"; #P_asb_2022-07 Fix LaunchAnyWhere in AppRestrictionsFragment
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335111.patch"; #P_asb_2022-08 Verify ringtone from ringtone picker is audio
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335112.patch"; #P_asb_2022-08 Make bluetooth not discoverable via SliceDeepLinkTrampoline
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335113.patch"; #P_asb_2022-08 Fix: policy enforcement for location wifi scanning
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335114.patch"; #P_asb_2022-08 Fix Settings crash when setting a null ringtone
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335115.patch"; #P_asb_2022-08 Fix can't change notification sound for work profile.
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/335116.patch"; #P_asb_2022-08 Extract app label from component name in notification access confirmation UI
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/345910.patch"; #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/345911.patch"; #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/345912.patch"; #P_asb_2022-12 Add FLAG_SECURE for ChooseLockPassword and Pattern
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/351914.patch"; #P_asb_2023-03 FRP bypass defense in the settings app
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/351915.patch"; #P_asb_2023-03 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/359734.patch"; #P_asb_2023-06 Convert argument to intent in AddAccountSettings.
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/366136.patch"; #P_asb_2023-09 Prevent non-system IME from becoming device admin
-applyPatch "$DOS_PATCHES/android_packages_apps_Settings/370700.patch"; #P_asb_2023-10 Restrict ApnEditor settings
-applyPatch "$DOS_PATCHES/android_packages_apps_Traceur/378475.patch"; #P_asb_2023-06 Update Traceur to check admin user status
-applyPatch "$DOS_PATCHES/android_packages_apps_Traceur/378476.patch"; #P_asb_2023-06 Add DISALLOW_DEBUGGING_FEATURES check
-applyPatch "$DOS_PATCHES/android_packages_apps_Trebuchet/366137.patch"; #P_asb_2023-09 Fix permission issue in legacy shortcut
-applyPatch "$DOS_PATCHES/android_packages_apps_Trebuchet/377775.patch"; #P_asb_2023-12 Fix permission bypass in legacy shortcut
-applyPatch "$DOS_PATCHES/android_packages_apps_TvSettings/359735.patch"; #P_asb_2023-06 Convert argument to intent in addAccount TvSettings.
-applyPatch "$DOS_PATCHES/android_packages_providers_ContactsProvider/335110.patch"; #P_asb_2022-08 enforce stricter CallLogProvider query
-applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/383567.patch"; #P_asb_2024-02 Consolidate queryChildDocumentsXxx() implementations
-applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/344182.patch"; #P_asb_2022-11 Check dir path before updating permissions.
-applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/364616.patch"; #P_asb_2023-08 Update file permissions using canonical path
-applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/374920.patch"; #P_asb_2023-11 Block access to sms/mms db from work profile.
-applyPatch "$DOS_PATCHES/android_packages_services_BuiltInPrintService/374919.patch"; #P_asb_2023-11 Adjust APIs for CUPS 2.3.3
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/330959.patch"; #P_asb_2022-05 Handle null bindings returned from ConnectionService.
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/332764.patch"; #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/344183.patch"; #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/345913.patch"; #P_asb_2022-12 Hide overlay windows when showing phone account enable/disable screen.
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/347042.patch"; #P_asb_2023-01 Fix security vulnerability when register phone accounts.
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/356150.patch"; #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/364617.patch"; #P_asb_2023-08 Resolve StatusHints image exploit across user.
-applyPatch "$DOS_PATCHES/android_packages_services_Telecomm/377776.patch"; #P_asb_2023-12 Resolve account image icon profile boundary exploit.
-applyPatch "$DOS_PATCHES/android_packages_services_Telephony/347041.patch"; #P_asb_2023-01 prevent overlays on the phone settings
-applyPatch "$DOS_PATCHES/android_packages_services_Telephony/366130.patch"; #P_asb_2023-09 Fixed leak of cross user data in multiple settings.
-applyPatch "$DOS_PATCHES/android_system_bt/334266.patch"; #P_asb_2022-07 Security: Fix out of bound write in HFP client
-applyPatch "$DOS_PATCHES/android_system_bt/334267.patch"; #P_asb_2022-07 Check Avrcp packet vendor length before extracting length
-applyPatch "$DOS_PATCHES/android_system_bt/334268.patch"; #P_asb_2022-07 Security: Fix out of bound read in AT_SKIP_REST
-applyPatch "$DOS_PATCHES/android_system_bt/335109.patch"; #P_asb_2022-08 Removing bonded device when auth fails due to missing keys
-applyPatch "$DOS_PATCHES/android_system_bt/338350.patch"; #P_asb_2022-09 Fix OOB in bnep_is_packet_allowed
-applyPatch "$DOS_PATCHES/android_system_bt/338351.patch"; #P_asb_2022-09 Fix OOB in BNEP_Write
-applyPatch "$DOS_PATCHES/android_system_bt/338352.patch"; #P_asb_2022-09 Fix OOB in reassemble_and_dispatch
-applyPatch "$DOS_PATCHES/android_system_bt/342097.patch"; #P_asb_2022-10 Fix potential interger overflow when parsing vendor response
-applyPatch "$DOS_PATCHES/android_system_bt/344184.patch"; #P_asb_2022-11 Add negative length check in process_service_search_rsp
-applyPatch "$DOS_PATCHES/android_system_bt/344185.patch"; #P_asb_2022-11 Add buffer in pin_reply in bluetooth.cc
-applyPatch "$DOS_PATCHES/android_system_bt/345914.patch"; #P_asb_2022-12 Add length check when copy AVDTP packet
-applyPatch "$DOS_PATCHES/android_system_bt/345915.patch"; #P_asb_2022-12 Added max buffer length check
-applyPatch "$DOS_PATCHES/android_system_bt/345916.patch"; #P_asb_2022-12 Add missing increment in bnep_api.cc
-applyPatch "$DOS_PATCHES/android_system_bt/345917.patch"; #P_asb_2022-12 Add length check when copy AVDT and AVCT packet
-applyPatch "$DOS_PATCHES/android_system_bt/345918.patch"; #P_asb_2022-12 Fix integer overflow when parsing avrc response
-applyPatch "$DOS_PATCHES/android_system_bt/347127.patch"; #P_asb_2023-01 BT: Once AT command is retrieved, return from method.
-applyPatch "$DOS_PATCHES/android_system_bt/347128.patch"; #P_asb_2023-01 AVRC: Validating msg size before accessing fields
-applyPatch "$DOS_PATCHES/android_system_bt/349334.patch"; #P_asb_2023-02 Report failure when not able to connect to AVRCP
-applyPatch "$DOS_PATCHES/android_system_bt/349335.patch"; #P_asb_2023-02 Add bounds check in avdt_scb_act.cc
-applyPatch "$DOS_PATCHES/android_system_bt/351916.patch"; #P_asb_2023-03 Fix an OOB Write bug in gatt_check_write_long_terminate
-applyPatch "$DOS_PATCHES/android_system_bt/351917.patch"; #P_asb_2023-03 Fix an OOB access bug in A2DP_BuildMediaPayloadHeaderSbc
-applyPatch "$DOS_PATCHES/android_system_bt/351918.patch"; #P_asb_2023-03 Fix an OOB write in SDP_AddAttribute
-applyPatch "$DOS_PATCHES/android_system_bt/354246.patch"; #P_asb_2023-04 Fix OOB access in avdt_scb_hdl_pkt_no_frag
-applyPatch "$DOS_PATCHES/android_system_bt/354247.patch"; #P_asb_2023-04 Fix an OOB bug in register_notification_rsp
-applyPatch "$DOS_PATCHES/android_system_bt/359736.patch"; #P_asb_2023-06 Prevent use-after-free of HID reports
-applyPatch "$DOS_PATCHES/android_system_bt/359737.patch"; #P_asb_2023-06 Revert "Revert "Validate buffer length in sdpu_build_uuid_seq""
-applyPatch "$DOS_PATCHES/android_system_bt/359738.patch"; #P_asb_2023-06 Revert "Revert "Fix wrong BR/EDR link key downgrades (P_256->P_192)""
-applyPatch "$DOS_PATCHES/android_system_bt/361252.patch"; #P_asb_2023-07 Fix gatt_end_operation buffer overflow
-applyPatch "$DOS_PATCHES/android_system_bt/366131.patch"; #P_asb_2023-09 Fix an integer overflow bug in avdt_msg_asmbl
-applyPatch "$DOS_PATCHES/android_system_bt/366132.patch"; #P_asb_2023-09 Fix integer overflow in build_read_multi_rsp
-applyPatch "$DOS_PATCHES/android_system_bt/366133.patch"; #P_asb_2023-09 Fix potential abort in btu_av_act.cc
-applyPatch "$DOS_PATCHES/android_system_bt/366134.patch"; #P_asb_2023-09 Fix reliable write.
-applyPatch "$DOS_PATCHES/android_system_bt/366135.patch"; #P_asb_2023-09 Fix UAF in gatt_cl.cc
-applyPatch "$DOS_PATCHES/android_system_bt/377777.patch"; #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [1]
-applyPatch "$DOS_PATCHES/android_system_bt/377778.patch"; #P_asb_2023-12 Reject access to secure services authenticated from temp bonding [2]
-applyPatch "$DOS_PATCHES/android_system_bt/377779.patch"; #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [3]
-applyPatch "$DOS_PATCHES/android_system_bt/377780.patch"; #P_asb_2023-12 Reorganize the code for checking auth requirement
-applyPatch "$DOS_PATCHES/android_system_bt/377781.patch"; #P_asb_2023-12Enforce authentication if encryption is required
-applyPatch "$DOS_PATCHES/android_system_bt/377782.patch"; #P_asb_2023-12 Fix timing attack in BTM_BleVerifySignature
-applyPatch "$DOS_PATCHES/android_system_bt/379796.patch"; #P_asb_2024-01 Fix some OOB errors in BTM parsing
-applyPatch "$DOS_PATCHES/android_system_bt/383565.patch"; #P_asb_2024-02 Fix an OOB bug in btif_to_bta_response and attp_build_value_cmd
-applyPatch "$DOS_PATCHES/android_system_bt/383566.patch"; #P_asb_2024-02 Fix an OOB write bug in attp_build_read_by_type_value_cmd
-applyPatch "$DOS_PATCHES/android_system_bt/385675.patch"; #P_asb_2024-03 Fix OOB caused by invalid SMP packet length
-applyPatch "$DOS_PATCHES/android_system_bt/385676.patch"; #P_asb_2024-03 Fix an OOB bug in smp_proc_sec_req
-applyPatch "$DOS_PATCHES/android_system_bt/385677.patch"; #P_asb_2024-03 Reland: Fix an OOB write bug in attp_build_value_cmd
-applyPatch "$DOS_PATCHES/android_system_bt/385678.patch"; #P_asb_2024-03 Fix a security bypass issue in access_secure_service_from_temp_bond
-applyPatch "$DOS_PATCHES/android_system_ca-certificates/365328.patch"; #P_asb_2023-08 Drop TrustCor certificates
-applyPatch "$DOS_PATCHES/android_system_ca-certificates/374916.patch"; #P_asb_2023-11 Remove E-Tugra certificates.
-applyPatch "$DOS_PATCHES/android_system_core/332765.patch"; #P_asb_2022-06 Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host.
-applyPatch "$DOS_PATCHES/android_system_netd/378480.patch"; #P_asb_2023-12 Fix Heap-use-after-free in MDnsSdListener::Monitor::run
-applyPatch "$DOS_PATCHES/android_system_nfc/332766.patch"; #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-applyPatch "$DOS_PATCHES/android_system_nfc/332767.patch"; #P_asb_2022-06 Double Free in ce_t4t_data_cback
-applyPatch "$DOS_PATCHES/android_system_nfc/332768.patch"; #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-applyPatch "$DOS_PATCHES/android_system_nfc/342098.patch"; #P_asb_2022-10 The length of a packet should be non-zero
-applyPatch "$DOS_PATCHES/android_system_nfc/354248.patch"; #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-applyPatch "$DOS_PATCHES/android_system_nfc/361251.patch"; #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-applyPatch "$DOS_PATCHES/android_tools_apksig/361280.patch"; #P_asb_2023-07 Create source stamp verifier
-applyPatch "$DOS_PATCHES/android_tools_apksig/361281.patch"; #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332769.patch"; #P_asb_2022-06 Prevent OOB write in nfc_ncif_proc_ee_discover_req
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332770.patch"; #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332771.patch"; #P_asb_2022-06 Double Free in ce_t4t_data_cback
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332772.patch"; #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/342099.patch"; #P_asb_2022-10 The length of a packet should be non-zero
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/354249.patch"; #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/361253.patch"; #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_halimpl/344190.patch"; #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_packages_apps_Nfc/332773.patch"; #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_packages_apps_Nfc/349336.patch"; #P_asb_2023-02 OOBW in phNciNfc_MfCreateXchgDataHdr
diff --git a/Misc/pick-imports/16-asbs.txt b/Misc/pick-imports/16-asbs.txt
deleted file mode 100644
index 30dfc133..00000000
--- a/Misc/pick-imports/16-asbs.txt
+++ /dev/null
@@ -1,438 +0,0 @@
-https://github.com/LineageOS/android_frameworks_base/commit/ea52854b208d2a8e367c65068edbdff741b9eb80 330961 #P_asb_2022-05 Keyguard - Treat messsages to lock with priority
-https://github.com/LineageOS/android_frameworks_base/commit/6bc4a89b9680b780768ee2b92a01f979b708c00b 330962 #P_asb_2022-05 Verify caller before auto granting slice permission
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/e298920fbeb8714698c6e96beaff71383640878b 330959 #P_asb_2022-05 Handle null bindings returned from ConnectionService.
-https://github.com/LineageOS/android_packages_apps_Settings/commit/cfe47c5ab58c17fe9e2b580874878347461d8695 330960 #P_asb_2022-05 Hide private DNS settings UI in Guest mode
-https://github.com/LineageOS/android_frameworks_base/commit/a1c1383a08e17e14273e0f2e7d1c250fb4e3b7f2 330963 #P_asb_2022-05 Always restart apps if base.apk gets updated.
-
-
-
-
-https://github.com/LineageOS/android_external_aac/commit/e40800a613eb89b5b4c701774c3cecc1c2b7dd6c 332775 #P_asb_2022-06 Reject invalid out of band config in transportDec_OutOfBandConfig() and skip re-allocation.
-https://github.com/LineageOS/android_frameworks_base/commit/4005549db2fa7e1524fc0dbbe22c774fb00b6cb3 332779 #P_asb_2022-06 Prevent non-admin users from deleting system apps.
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/526bbbb30625c4b2728d4c461137413dbd1a96f6 332764 #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10
-https://github.com/LineageOS/android_system_core/commit/976019d07ad1c007043b78450857f428a1440f06 332765 #P_asb_2022-06 Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host.
-https://github.com/LineageOS/android_frameworks_base/commit/c8da70733ac6be9b209b27b8bd72f9b0f0a2ee44 332778 #P_asb_2022-06 Fix security hole in GateKeeperResponse
-https://github.com/LineageOS/android_frameworks_base/commit/e7f0f7bac948a3deb2ef9139ef4fd9ad9eb1215a 332777 #P_asb_2022-06 Add an OEM configurable limit for zen rules
-https://github.com/LineageOS/android_frameworks_base/commit/c6a97af0e9b22c303d13ad573e96eb4b06c0bfa3 332776 #P_asb_2022-06 Update GeofenceHardwareRequestParcelable to match parcel/unparcel format.
-https://github.com/LineageOS/android_frameworks_base/commit/76c531e222779ae68047010f42f7a36100010f4c 332757 #P_asb_2022-06 limit TelecomManager#registerPhoneAccount to 10; api doc update
-https://github.com/LineageOS/android_frameworks_base/commit/258ab4cfd77e49b087f4b3333c21ecb23d4c2a9f 332756 #P_asb_2022-06 Add finalizeWorkProfileProvisioning.
-https://github.com/LineageOS/android_packages_apps_Nfc/commit/d7722eaa4defeaea88dce9f3c644e038af3f637d 332762 #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-https://github.com/LineageOS/android_packages_apps_Settings/commit/ecf8fd5a9aa4976ace98fe9a4986f1de3ff77c1d 332763 #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-https://github.com/LineageOS/android_packages_apps_Dialer/commit/71701cfc7511cd3ad2e8a0f0f12dd78ea8db2517 332761 #P_asb_2022-06 No longer export CallSubjectDialog
-https://github.com/LineageOS/android_packages_apps_Contacts/commit/5055718d99866a7783cf72199b3f385e68bc7a53 332760 #P_asb_2022-06 No longer export CallSubjectDialog
-https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/6ff1c1f2e637e0dc3fc803f8028c7b89bae74937 332759 #P_asb_2022-06 Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission.
-https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/eb31965a73439dc8638d03b23f4648774a05df57 332758 #P_asb_2022-06 Removes app access to BluetoothAdapter#setScanMode by requiring BLUETOOTH_PRIVILEGED permission.
-https://github.com/LineageOS/android_vendor_nxp_opensource_packages_apps_Nfc/commit/08fbee6160c576d2d9feff91af2ed3ce0bff2cb7 332773 #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
-https://github.com/LineageOS/android_system_nfc/commit/318f09ce7e384809e3ab68c0294be96da6bf5141 332766 #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-https://github.com/LineageOS/android_system_nfc/commit/af0a965cd72fa6cab442fc46068fe4e556ca14c3 332767 #P_asb_2022-06 Double Free in ce_t4t_data_cback
-https://github.com/LineageOS/android_system_nfc/commit/09dd85730f6c7ea4e2da2a9bf51de5d45a3b1061 332768 #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/a6c1507a0fa5a844514ecae89d0758ccb8724585 332769 #P_asb_2022-06 Prevent OOB write in nfc_ncif_proc_ee_discover_req
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/9dd0310855fa8889217e4e077bcfc7822abdbdc2 332770 #P_asb_2022-06 Out of Bounds Read in nfa_dm_check_set_config
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/84a8c1e3350174c25da59c7c6479b0dca37df111 332771 #P_asb_2022-06 Double Free in ce_t4t_data_cback
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/d5b6e36b4d5585d3e003d16ba6aa73929ae7255d 332772 #P_asb_2022-06 OOBR in nfc_ncif_proc_ee_discover_req()
-https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/82c9270c2cf11b9a2ac4b5942f3ec086bc02099c 342101 #P_asb_2022-06 Prevent exfiltration of system files via user image settings.
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/862a9ed37b4cc89f450e6159cec65552e6e9fd38 334256 #P_asb_2022-07 StorageManagerService: don't ignore failures to prepare user storage
-https://github.com/LineageOS/android_frameworks_base/commit/10600c7c0cb582877cae6d3a28c9e39a73add1e1 334257 #P_asb_2022-07 UserDataPreparer: reboot to recovery if preparing user storage fails
-https://github.com/LineageOS/android_frameworks_base/commit/44130eac9f128dbea908171de1fa0743f2dda709 334258 #P_asb_2022-07 UserDataPreparer: reboot to recovery for system user only
-https://github.com/LineageOS/android_frameworks_base/commit/8b1d16f79b125ea356d7af582fc6ceac297afa04 334259 #P_asb_2022-07 Ignore errors preparing user storage for existing users
-https://github.com/LineageOS/android_frameworks_base/commit/2688ed5ff6c1c637444ba776d730940769b2ee1d 334260 #P_asb_2022-07 Log to EventLog on prepareUserStorage failure
-https://github.com/LineageOS/android_frameworks_base/commit/bcede32d6c0c192b00fa745e522d50b817ea969b 334262 #P_asb_2022-07 Crash invalid FGS notifications
-https://github.com/LineageOS/android_packages_apps_KeyChain/commit/5e04f66b9db71a74b7dbf6ca9a43b602d5fca122 334264 #P_asb_2022-07 Encode authority part of uri before showing in UI
-https://github.com/LineageOS/android_packages_apps_Settings/commit/1fee30e9946eec7ec5b0c95481317cd1647c92a7 334265 #P_asb_2022-07 Fix LaunchAnyWhere in AppRestrictionsFragment
-https://github.com/LineageOS/android_system_bt/commit/b15c9cc55faddbdb36df6af086762adfef028bbe 334266 #P_asb_2022-07 Security: Fix out of bound write in HFP client
-https://github.com/LineageOS/android_system_bt/commit/5d7b97ac9aa45287bf57d061b7e1e0287c7c513a 334267 #P_asb_2022-07 Check Avrcp packet vendor length before extracting length
-https://github.com/LineageOS/android_frameworks_opt_telephony/commit/4e3e190ff664797f23039da13a45a70ddf615489 334263 #P_asb_2022-07 Enforce privileged phone state for getSubscriptionProperty(GROUP_UUID)
-https://github.com/LineageOS/android_system_bt/commit/f41d68b53f669b96787f5fde38bdc5fe73e795b8 334268 #P_asb_2022-07 Security: Fix out of bound read in AT_SKIP_REST
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/35c2fc9116afdd6fe2dcca6e4fb59466a317b342 335117 #P_asb_2022-08 Only allow system and same app to apply relinquishTaskIdentity
-https://github.com/LineageOS/android_system_bt/commit/8bfd408fa1ebf3d8dc2fc9906672c7cfe7dc0144 335109 #P_asb_2022-08 Removing bonded device when auth fails due to missing keys
-https://github.com/LineageOS/android_packages_providers_ContactsProvider/commit/3b27f760484b42cc1ea25af7bdeb68b40cdfa455 335110 #P_asb_2022-08 enforce stricter CallLogProvider query
-https://github.com/LineageOS/android_packages_apps_Settings/commit/9dfc928466d7709c968adcba7f22378e243b99f2 335111 #P_asb_2022-08 Verify ringtone from ringtone picker is audio
-https://github.com/LineageOS/android_packages_apps_Settings/commit/539f79473852aab2bebcc7374404f47eccb297b1 335112 #P_asb_2022-08 Make bluetooth not discoverable via SliceDeepLinkTrampoline
-https://github.com/LineageOS/android_packages_apps_Settings/commit/b8e381a8e5b104a455efb6b4352eee04b1fb4a5c 335113 #P_asb_2022-08 Fix: policy enforcement for location wifi scanning
-https://github.com/LineageOS/android_packages_apps_Settings/commit/83ce5e4d8f0bb352ed433e711acacdd1a51130fe 335114 #P_asb_2022-08 Fix Settings crash when setting a null ringtone
-https://github.com/LineageOS/android_packages_apps_Settings/commit/91b6470dde8a9b2586273796c183a29000a82ce5 335115 #P_asb_2022-08 Fix can't change notification sound for work profile.
-https://github.com/LineageOS/android_packages_apps_Settings/commit/ccebafea047fef8ab93c4e748ab1b9a15280702b 335116 #P_asb_2022-08 Extract app label from component name in notification access confirmation UI
-https://github.com/LineageOS/android_frameworks_base/commit/a532c1aeec285ebd601ceb266f0af8553ccef5df 335118 #P_asb_2022-08 Suppress notifications when device enter lockdown
-https://github.com/LineageOS/android_frameworks_base/commit/017b9b6b000693a5e48ba7431bf638c257833ec3 335119 #P_asb_2022-08 Remove package title from notification access confirmation intent
-https://github.com/LineageOS/android_frameworks_base/commit/53f3e590ac533cacdf7e78ec701a8e365c89901b 335121 #P_asb_2022-08 Only allow the system server to connect to sync adapters
-https://github.com/LineageOS/android_frameworks_base/commit/cb2cb0520dd1f4c7e19e806cde02fc3da6a355d2 335120 #P_asb_2022-08 Stop using invalid URL to prevent unexpected crash
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/26e3268f3cac1d120d8b4683e8d5201b70f44fc2 338346 #P_asb_2022-09 Fix duplicate permission privilege escalation
-https://github.com/LineageOS/android_frameworks_base/commit/b98ed505d5c477f5d6e1f88433a5c9f1cb03025e 338347 #P_asb_2022-09 Parcel: recycle recycles
-https://github.com/LineageOS/android_frameworks_base/commit/3a1887eb6147d7e51a79c387aaed38c08056c789 338348 #P_asb_2022-09 IMMS: Make IMMS PendingIntents immutable
-https://github.com/LineageOS/android_frameworks_base/commit/031578d71058c6400ea91b1806b467aca2de54b1 338349 #P_asb_2022-09 Remove package name from SafetyNet logs
-https://github.com/LineageOS/android_external_expat/commit/31f7a33a236a574c7c4bea5de648c349fa1e7508 338353 #P_asb_2022-09 Prevent integer overflow in copyString
-https://github.com/LineageOS/android_external_expat/commit/5c70aa4e573cf46f6127aa6713c09877a246bf6b 338354 #P_asb_2022-09 Prevent XML_GetBuffer signed integer overflow
-https://github.com/LineageOS/android_external_expat/commit/68116f18efee226636fdc2ecf518f3de589c98a8 338355 #P_asb_2022-09 Prevent integer overflow in function doProlog
-https://github.com/LineageOS/android_external_expat/commit/883c4901f5ca13cf202c9c234612e117f0ef092e 338356 #P_asb_2022-09 Prevent more integer overflows
-https://github.com/LineageOS/android_system_bt/commit/a940244a653c0c20e5d08aaf40484da93300dc3f 338350 #P_asb_2022-09 Fix OOB in bnep_is_packet_allowed
-https://github.com/LineageOS/android_system_bt/commit/de882ad1be24fa351ad8ba483b89c2b0b1e615c6 338351 #P_asb_2022-09 Fix OOB in BNEP_Write
-https://github.com/LineageOS/android_system_bt/commit/88b4c659bc53971605a5cdde56f94b2d90677d20 338352 #P_asb_2022-09 Fix OOB in reassemble_and_dispatch
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_external_dtc/commit/d8ff0456cbe3b32b5f71dd0740f9a6cca6de27b9 342096 #P_asb_2022-10 libfdt: fdt_offset_ptr(): Fix comparison warnings
-https://github.com/LineageOS/android_system_bt/commit/024bd7b32e3298ceaf70443e9224aff56cf8de4b 342097 #P_asb_2022-10 Fix potential interger overflow when parsing vendor response
-https://github.com/LineageOS/android_system_nfc/commit/f7eb9ba0755d2ab170d7fa7f46d67ebed4690426 342098 #P_asb_2022-10 The length of a packet should be non-zero
-https://github.com/LineageOS/android_frameworks_base/commit/950c44f0e7229672ea093e86d7f05df00b33844d 342100 #P_asb_2022-10 Limit the number of concurrently snoozed notifications
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/c5cae87d66c3b8d459677da775cc61e550bba993 342099 #P_asb_2022-10 The length of a packet should be non-zero
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_packages_apps_PackageInstaller/commit/79fbc97fa9030bc872c26dde69d3d6b5ca50d42c 344181 #P_asb_2022-11 Hide overlays on ReviewPermissionsAtivity
-https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/915289305d5bd55c3a9e5667acab9cfec8f68d31 344182 #P_asb_2022-11 Check dir path before updating permissions.
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/9bd081d4162ee1bd99eed4a2f8c144255a3b7a41 344183 #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-https://github.com/LineageOS/android_system_bt/commit/b8332ffa326c412c7952bcae1ad924a8542caa8e 344184 #P_asb_2022-11 Add negative length check in process_service_search_rsp
-https://github.com/LineageOS/android_system_bt/commit/9e3a7208a794cb350b5b1565db4e1120d7b1373d 344185 #P_asb_2022-11 Add buffer in pin_reply in bluetooth.cc
-https://github.com/LineageOS/android_frameworks_base/commit/fcd8dc4d686c362b7353f9d7c6a3b05994cc0565 344168 #P_asb_2022-11 Move accountname and typeName length check from Account.java to AccountManagerService.
-https://github.com/LineageOS/android_frameworks_base/commit/bad61936167d1d7eca8dc155e8c0c8a248a2bc5c 344169 #P_asb_2022-11 switch TelecomManager List getters to ParceledListSlice
-https://github.com/LineageOS/android_frameworks_base/commit/e72558a547d48190469c0763a9e317d1792a9f53 344170 #P_asb_2022-11 Do not send new Intent to non-exported activity when navigateUpTo
-https://github.com/LineageOS/android_frameworks_base/commit/6a42e12de4cf0f2de93cbd8bb4506de8a83dd88a 344171 #P_asb_2022-11 Do not send AccessibilityEvent if notification is for different user.
-https://github.com/LineageOS/android_frameworks_base/commit/36b533a308ced7203f515daed97d0f15bb65587f 344172 #P_asb_2022-11 Trim any long string inputs that come in to AutomaticZenRule
-https://github.com/LineageOS/android_frameworks_base/commit/114dcf0b5836c0c982a560e85350f408c8640bdf 344173 #P_asb_2022-11 Check permission for VoiceInteraction
-https://github.com/LineageOS/android_frameworks_base/commit/22e363c319e6fddeea39f00f7ef5e63395a45dc5 344174 #P_asb_2022-11 Do not dismiss keyguard after SIM PUK unlock
-https://github.com/LineageOS/android_hardware_nxp_nfc/commit/70c3eef94c74e78d9bf9e9119d58ca0a5082cf2f 344180 #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-https://github.com/LineageOS/android_external_dtc/commit/c34b2c464b0900d3e79aa1c64c25137fd09c4762 344161 #P_asb_2022-11 Fix integer wrap sanitisation.
-https://github.com/LineageOS/android_frameworks_av/commit/2692e4bcdba06eec20424291acaac5669acf581f 344167 #P_asb_2022-11 setSecurityLevel in clearkey
-https://github.com/LineageOS/android_vendor_nxp_opensource_halimpl/commit/9d9f191dd2522aa286bdc3c42d6777b6e503356b 344190 #P_asb_2022-11 OOBW in phNxpNciHal_write_unlocked()
-
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_system_bt/commit/cea94f7ab0d36254a99d5854b9c2e83afd4584bc 345915 #P_asb_2022-12 Added max buffer length check
-https://github.com/LineageOS/android_system_bt/commit/56ea90b69d6715e7e1f0ddd35fd5ca7e19d93dc6 345916 #P_asb_2022-12 Add missing increment in bnep_api.cc
-https://github.com/LineageOS/android_system_bt/commit/da6430bd4b319f8398deaef8d74341234fb79624 345917 #P_asb_2022-12 Add length check when copy AVDT and AVCT packet
-https://github.com/LineageOS/android_system_bt/commit/222fad2e71f159e3d6e0bc0aef36f83cbf3fcdfa 345918 #P_asb_2022-12 Fix integer overflow when parsing avrc response
-https://github.com/LineageOS/android_frameworks_base/commit/16da2229db1aa80499b296bc8c384fe78add0e30 345892 #P_asb_2022-12 Revert "Prevent non-admin users from deleting system apps."
-https://github.com/LineageOS/android_frameworks_base/commit/921f748f4dd12465721dc7e8ed86f89c0718da57 345893 #P_asb_2022-12 Limit the size of NotificationChannel and NotificationChannelGroup
-https://github.com/LineageOS/android_frameworks_base/commit/4bdaa78394c95a864f1d34ec1997c6494dbece15 345894 #P_asb_2022-12 Prevent non-admin users from deleting system apps.
-https://github.com/LineageOS/android_frameworks_base/commit/c8ac5b6a05bb584e196b4c1bd4b819914c4018b6 345895 #P_asb_2022-12 Validate package name passed to setApplicationRestrictions.
-https://github.com/LineageOS/android_frameworks_base/commit/9e0a825e2ca0cf102fc462af55f5a471d6d5836d 345896 #P_asb_2022-12 Include all enabled services when FEEDBACK_ALL_MASK.
-https://github.com/LineageOS/android_frameworks_base/commit/8d88ee0de3b9e474fcc70ab121186df93bf75456 345897 #P_asb_2022-12 [pm] forbid deletion of protected packages
-https://github.com/LineageOS/android_frameworks_base/commit/c4763f78a2ab695992cf63709b665c7478d43891 345898 #P_asb_2022-12 Fix NPE
-https://github.com/LineageOS/android_frameworks_base/commit/08605e9ee1e96336fe3202066a6cdba21cf377ad 345899 #P_asb_2022-12 Fix a security issue in app widget service.
-https://github.com/LineageOS/android_frameworks_base/commit/4d5e30ccea8cc4dec6359f004173d896c4b01556 345900 #P_asb_2022-12 Ignore malformed shortcuts
-https://github.com/LineageOS/android_frameworks_base/commit/58e177ca589576cacfd1ed016bdd5d0bf4cb9a5d 345901 #P_asb_2022-12 Fix permanent denial of service via setComponentEnabledSetting
-https://github.com/LineageOS/android_frameworks_base/commit/be00f79f1148a27fd9161e65ebaa2eedb7fca4c7 345902 #P_asb_2022-12 Add safety checks on KEY_INTENT mismatch.
-https://github.com/LineageOS/android_frameworks_minikin/commit/4f583889fcc90883fa3ec86befa20c671ec8774e 345903 #P_asb_2022-12 Fix OOB read for registerLocaleList
-https://github.com/LineageOS/android_frameworks_minikin/commit/89b513681269399b4d2621f0c1750daa48f77681 345904 #P_asb_2022-12 Fix OOB crash for registerLocaleList
-https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/f7624d5f831e8576a816feaebb120974e54c23b6 345907 #P_asb_2022-12 Fix URI check in BluetoothOppUtility.java
-https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/c6cd624a87b1b8f586ef83b2a810c36669b55a0b 345908 #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/d25bc7d14e791a049698ac2c7cbd9c72e6e7592d 345909 #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-https://github.com/LineageOS/android_packages_apps_Settings/commit/06242790f0f2b20e1f0caa0548924d1fcddfca93 345910 #P_asb_2022-12 Revert "Prevent exfiltration of system files via user image settings."
-https://github.com/LineageOS/android_packages_apps_Settings/commit/090473035dd448e96138844bfec0c88952acf3d1 345911 #P_asb_2022-12 Prevent exfiltration of system files via avatar picker.
-https://github.com/LineageOS/android_packages_apps_Settings/commit/6f9c13de0a620203fe7d6bcdfd6d94c74e22706b 345912 #P_asb_2022-12 Add FLAG_SECURE for ChooseLockPassword and Pattern
-https://github.com/LineageOS/android_external_dtc/commit/77e6d383cde91d7ac8bbb159de215ec198e9f1aa 345891 #P_asb_2022-12 libfdt: fdt_path_offset_namelen: Reject empty paths
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/fae9a71b822b913e7516333484e8efd513e1640d 345913 #P_asb_2022-12 Hide overlay windows when showing phone account enable/disable screen.
-https://github.com/LineageOS/android_system_bt/commit/210fe2c41c04d50c7a82a6415d7708ff5d055b3e 345914 #P_asb_2022-12 Add length check when copy AVDTP packet
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/7f7b42f83fd7aef7570450b82c5931aa81f1e66d 347044 #P_asb_2023-01 Limit lengths of fields in Condition to a max length.
-https://github.com/LineageOS/android_frameworks_base/commit/91726ddbd32c8b5226991492354f1d93616c6cfd 347045 #P_asb_2023-01 Disable all A11yServices from an uninstalled package.
-https://github.com/LineageOS/android_frameworks_base/commit/2dc4e2467dcebfc827d68f573570cd04e6ea6244 347046 #P_asb_2023-01 Fix conditionId string trimming in AutomaticZenRule
-https://github.com/LineageOS/android_frameworks_base/commit/9b5407d68859e615a2ee7a229f486fc5365682da 347047 #P_asb_2023-01 [SettingsProvider] mem limit should be checked before settings are updated
-https://github.com/LineageOS/android_frameworks_base/commit/66a9e8fc457e7257b78dfef3f18eab01c63efc12 347048 #P_asb_2023-01 Revert "Revert "Validate permission tree size..."
-https://github.com/LineageOS/android_frameworks_base/commit/c8892a45db45ee79085b0ee620b3d8f69f560d03 347049 #P_asb_2023-01 [SettingsProvider] key size limit for mutating settings
-https://github.com/LineageOS/android_frameworks_base/commit/9e7745eeedc6066e91e0c508d49c8db15a8ae6bf 347050 #P_asb_2023-01 Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23
-https://github.com/LineageOS/android_frameworks_base/commit/be4c10b9f70b5033bc6f75649265a12f65ad0bc3 347051 #P_asb_2023-01 Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed.
-https://github.com/LineageOS/android_packages_services_Telephony/commit/d596467cc3b161beca194ce4c8f96efcd0d6a340 347041 #P_asb_2023-01 prevent overlays on the phone settings
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/7636df9f0dcff2d9b272f925b956348fc8dc384b 347042 #P_asb_2023-01 Fix security vulnerability when register phone accounts.
-https://github.com/LineageOS/android_packages_apps_Nfc/commit/48b3f34578cd9757a11c1cd694527b45c5915ae8 347043 #P_asb_2023-01 OOBW in Mfc_Transceive()
-https://github.com/LineageOS/android_system_bt/commit/deb080bb11eadef601ec11633317090f060e50bb 347127 #P_asb_2023-01 BT: Once AT command is retrieved, return from method.
-https://github.com/LineageOS/android_system_bt/commit/0c74f58652259adde281b7d8b13732a8f0e9ab92 347128 #P_asb_2023-01 AVRC: Validating msg size before accessing fields
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/a9d49368cb13ba9d98af67ae9a96b82ae7fc4e46 349330 #P_asb_2023-02 Correct the behavior of ACTION_PACKAGE_DATA_CLEARED
-https://github.com/LineageOS/android_frameworks_base/commit/7780547c156f34020ba7316e8c8cbea6c7985818 349331 #P_asb_2023-02 Convert argument to intent in ChooseTypeAndAccountActivity
-https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/90e0fb025afa7bfe3600b79c2e0e563b5d6124bb 349332 #P_asb_2023-02 Fix OPP comparison
-https://github.com/LineageOS/android_packages_apps_EmergencyInfo/commit/eeb60967a52197d04d331b8e87beb5f1fb9e92aa 349333 #P_asb_2023-02 Removes unnecessary permission from the EmergencyInfo app.
-https://github.com/LineageOS/android_system_bt/commit/12b2d2eeb63246e85e30389d2e885608e9209cc1 349334 #P_asb_2023-02 Report failure when not able to connect to AVRCP
-https://github.com/LineageOS/android_system_bt/commit/8e81bb1e80ccbba0724e12dabac61b9ac36d4b0f 349335 #P_asb_2023-02 Add bounds check in avdt_scb_act.cc
-https://github.com/LineageOS/android_vendor_nxp_opensource_packages_apps_Nfc/commit/35299f9e605257a17257c5da0064c3f7cc3dce4a 349336 #P_asb_2023-02 OOBW in phNciNfc_MfCreateXchgDataHdr
-https://github.com/LineageOS/android_external_expat/commit/281fc3aeb520277460014a8c398ba083d167f284 349328 #P_asb_2023-02 [CVE-2022-43680] Fix overeager DTD destruction (fixes #649)
-https://github.com/LineageOS/android_frameworks_av/commit/994d95501928153cb7b8f04587e3160bc17ce2a5 349329 #P_asb_2023-02 move MediaCodec metrics processing to looper thread
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_external_zlib/commit/d6e0dec5307a69aa6381246221803bdc050e5b96 351909 #P_asb_2023-03 Fix a bug when getting a gzip header extra field with inflate().
-https://github.com/LineageOS/android_packages_apps_Settings/commit/5f84b1609065c5b26f2b5278d83fdd791597a69f 351914 #P_asb_2023-03 FRP bypass defense in the settings app
-https://github.com/LineageOS/android_packages_apps_Settings/commit/718126925dc2e00c268f49d006231eb3edd5778a 351915 #P_asb_2023-03 Add DISALLOW_APPS_CONTROL check into uninstall app for all users
-https://github.com/LineageOS/android_system_bt/commit/b7dfbbdf4dc9ae5761816ad0a4875d46244ed25a 351916 #P_asb_2023-03 Fix an OOB Write bug in gatt_check_write_long_terminate
-https://github.com/LineageOS/android_system_bt/commit/b433704453d59946be0f5b30346cf0dd3e42ec09 351917 #P_asb_2023-03 Fix an OOB access bug in A2DP_BuildMediaPayloadHeaderSbc
-https://github.com/LineageOS/android_system_bt/commit/fcd19451fa2e3da35c3e0f5db0961b994ed1b49f 351918 #P_asb_2023-03 Fix an OOB write in SDP_AddAttribute
-https://github.com/LineageOS/android_frameworks_base/commit/3f8c0e9c4ad48b37c44e132a7a8e3fd157a83e00 351910 #P_asb_2023-03 Move service initialization
-https://github.com/LineageOS/android_frameworks_base/commit/11c799795be7c8bafedbc4eb3d940b4a1f93a308 351911 #P_asb_2023-03 Enable user graularity for lockdown mode
-https://github.com/LineageOS/android_frameworks_base/commit/d6401e37da9afb99f647b09fd3ce9aa38bb84016 351912 #P_asb_2023-03 Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag
-https://github.com/LineageOS/android_frameworks_base/commit/7d63c11542c202467f035e03644962a263cfdc19 351913 #P_asb_2023-03 Reconcile WorkSource parcel and unparcel code.
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/7ed39484667b94b738b7d1d7717ef5b640a7a405 354243 #P_asb_2023-04 Checking if package belongs to UID before registering broadcast receiver
-https://github.com/LineageOS/android_frameworks_base/commit/34184bc31e77a8db5b967ca275f6e4841bd5e3ff 354244 #P_asb_2023-04 Fix checkKeyIntentParceledCorrectly's bypass
-https://github.com/LineageOS/android_frameworks_base/commit/9cade5349e44f2b48ed6408e3b05a1272ff2a3ef 354245 #P_asb_2023-04 Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE
-https://github.com/LineageOS/android_frameworks_base/commit/1dc0540d7b8918a6043c0863b2bea0946b100b8e 354242 #P_asb_2023-04 Context#startInstrumentation could be started from SHELL only now.
-https://github.com/LineageOS/android_system_bt/commit/a883a17a9e05d87bfb1547d8b812522c771c971c 354246 #P_asb_2023-04 Fix OOB access in avdt_scb_hdl_pkt_no_frag
-https://github.com/LineageOS/android_system_bt/commit/d9472b7fba9c3a366e768ff4c28225d264aa6ad1 354247 #P_asb_2023-04 Fix an OOB bug in register_notification_rsp
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/5ad6edf34e69b9bd0334bb0b0a3592b8d5ded5b4 354249 #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-https://github.com/LineageOS/android_system_nfc/commit/d751463856e968430d4859a55a97f12b2553de19 354248 #P_asb_2023-04 OOBW in nci_snd_set_routing_cmd()
-
-
-
-
-
-
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/ffd36f517fae838fe836d6f189b2de6355e6814c 356150 #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-https://github.com/LineageOS/android_frameworks_native/commit/09ece8aee9246ba8ef5408e074165c9bbc2d6bc1 356151 #P_asb_2023-05 Check for malformed Sensor Flattenable
-https://github.com/LineageOS/android_frameworks_native/commit/c62382dd2192444ca7a81a0318521b03e852c355 356152 #P_asb_2023-05 Remove some new memory leaks from SensorManager
-https://github.com/LineageOS/android_frameworks_native/commit/30348a31e1c0eb604f1a2de40b57d734f71cb9e8 356153 #P_asb_2023-05 Add removeInstanceForPackageMethod to SensorManager
-https://github.com/LineageOS/android_frameworks_base/commit/e0f219e675b2a36304db2f163783fe82937c1d41 356156 #P_asb_2023-05 enforce stricter rules when registering phoneAccounts
-https://github.com/LineageOS/android_frameworks_base/commit/18025b2a135d7e7063201054b7f4409fe562ee56 356154 #P_asb_2023-05 Checks if AccessibilityServiceInfo is within parcelable size.
-https://github.com/LineageOS/android_frameworks_base/commit/0cfc7a41aa5b741452316b19bc100be58bbe3cc7 356155 #P_asb_2023-05 Uri: check authority and scheme as part of determining URI path
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/d4f4cbe1d4eb1e80f64676cb07e84a6409cd095f 359729 #P_asb_2023-06 Fix NuMediaExtractor::readSampleData buffer Handling
-https://github.com/LineageOS/android_packages_apps_Settings/commit/ed20a91b473462e14f7cea5dd1b8cbff4d0feab5 359734 #P_asb_2023-06 Convert argument to intent in AddAccountSettings.
-https://github.com/LineageOS/android_packages_apps_TvSettings/commit/3f8f5d733659d15eb78d0a3de97442c1c33259b8 359735 #P_asb_2023-06 Convert argument to intent in addAccount TvSettings.
-https://github.com/LineageOS/android_system_bt/commit/5f6f48a784284a9220ae70d9f99d96a25bd3adce 359736 #P_asb_2023-06 Prevent use-after-free of HID reports
-https://github.com/LineageOS/android_system_bt/commit/969a3c9aba7e8060f1bcf341375263d67fec01d2 359737 #P_asb_2023-06 Revert "Revert "Validate buffer length in sdpu_build_uuid_seq""
-https://github.com/LineageOS/android_system_bt/commit/d50fdc03f066f2b1bdb3bcb21d627a0e3ac9e268 359738 #P_asb_2023-06 Revert "Revert "Fix wrong BR/EDR link key downgrades (P_256->P_192)""
-https://github.com/LineageOS/android_frameworks_base/commit/c45ee6ab3ee0b8e4f16cc88d098fb9200b3a109a 359730 #P_asb_2023-06 Check key intent for selectors and prohibited flags
-https://github.com/LineageOS/android_frameworks_base/commit/22bac442d2249f6e02608f9994cf761bfdf90d80 359731 #P_asb_2023-06 Handle invalid data during job loading.
-https://github.com/LineageOS/android_frameworks_base/commit/24a90436bb260a64b427efb98f3aa40f0c27fe32 359732 #P_asb_2023-06 Allow filtering of services
-https://github.com/LineageOS/android_frameworks_base/commit/4974a8613d776dcd0dff6c8950b3dd1a7dbec465 359733 #P_asb_2023-06 Prevent RemoteViews crashing SystemUi
-https://github.com/LineageOS/android_packages_apps_Traceur/commit/43b23418ed73d1b64bb198a79c5825666c95684d 378475 #P_asb_2023-06 Update Traceur to check admin user status
-https://github.com/LineageOS/android_packages_apps_Traceur/commit/55e506621081e4e092a4434a763561d2a2f0859e 378476 #P_asb_2023-06 Add DISALLOW_DEBUGGING_FEATURES check
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_external_freetype/commit/31e8900c4e35a5b82ee19449830c87f8c1593504 361250 #P_asb_2023-07 Cherry-pick two upstream changes
-https://github.com/LineageOS/android_system_nfc/commit/6ea4e00c886e05116d1d6058fb4cf40e0ccdb70b 361251 #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-https://github.com/LineageOS/android_system_bt/commit/c4a3cf60380376537eefcce41eec053677c7732c 361252 #P_asb_2023-07 Fix gatt_end_operation buffer overflow
-https://github.com/LineageOS/android_vendor_nxp_opensource_external_libnfc-nci/commit/c2ad40e96300f65c3e16b06eccba282003385956 361253 #P_asb_2023-07 OOBW in rw_i93_send_to_upper()
-https://github.com/LineageOS/android_frameworks_base/commit/c1741be24b21788051c95fafb20f889f15c7b8a8 361254 #P_asb_2023-07 Sanitize VPN label to prevent HTML injection
-https://github.com/LineageOS/android_frameworks_base/commit/63ef19bd0f36f043fa72acbb8484cae2e48a07b1 361256 #P_asb_2023-07 Import translations. DO NOT MERGE ANYWHERE
-https://github.com/LineageOS/android_frameworks_base/commit/626a9919d79ad7584e30496f8b990a1a4e20ec40 361257 #P_asb_2023-07 Dismiss keyguard when simpin auth'd and...
-https://github.com/LineageOS/android_frameworks_base/commit/cfab4afce18c49c6abe6e25fce9add4b57bb65e4 361259 #P_asb_2023-07 Visit URIs in landscape/portrait custom remote views.
-https://github.com/LineageOS/android_tools_apksig/commit/011adec1a494974102930bf65a8d2fdfa8b375b5 361280 #P_asb_2023-07 Create source stamp verifier
-https://github.com/LineageOS/android_tools_apksig/commit/9a80527425030dae7f962ab95eda500a720cde47 361281 #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-https://github.com/LineageOS/android_frameworks_base/commit/3f7975447006b2246dd1b8722064ca26e40aae25 361258 #P_asb_2023-07 Truncate ShortcutInfo Id
-https://github.com/LineageOS/android_frameworks_base/commit/68f08d51b66b8336aeec2e01bcfa72ae5fbfb81d 361255 #P_asb_2023-07 Limit the number of supported v1 and v2 signers
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_external_aac/commit/c263e21d9cd270283c0fabddeb710798b6fe56aa 364605 #P_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
-https://github.com/LineageOS/android_external_freetype/commit/ef28d3d7460a814efef8174c44fde7aab4341db5 364606 #P_asb_2023-08 Cherrypick following three changes
-https://github.com/LineageOS/android_frameworks_base/commit/6adafe39c32f8236e18c57bc834caa88a09ad8cc 364608 #P_asb_2023-08 Verify URI permissions for notification shortcutIcon.
-https://github.com/LineageOS/android_frameworks_base/commit/0b2c705c891a44ac854cb5ec123fb869669ae5fe 364609 #P_asb_2023-08 On device lockdown, always show the keyguard
-https://github.com/LineageOS/android_frameworks_base/commit/84be6e930a60f855a318c41a446b92849b50087a 364610 #P_asb_2023-08 Ensure policy has no absurdly long strings
-https://github.com/LineageOS/android_frameworks_base/commit/aa0fb47602bd6bc95404d5a5468ba4db577c418f 364611 #P_asb_2023-08 Implement visitUris for RemoteViews ViewGroupActionAdd.
-https://github.com/LineageOS/android_frameworks_base/commit/42d2f7a7ac4004754050ddd53f2e5b626ae28c02 364612 #P_asb_2023-08 Check URIs in notification public version.
-https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/8e5a42af29838bd09b62ec199d744c4592258eeb 364616 #P_asb_2023-08 Update file permissions using canonical path
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/6428c62b978aefd829bf4e91493a356c3675e5c0 364617 #P_asb_2023-08 Resolve StatusHints image exploit across user.
-https://github.com/LineageOS/android_system_ca-certificates/commit/4c6994b1a05d435e40947a7315aae1a128984957 365328 #P_asb_2023-08 Drop TrustCor certificates
-https://github.com/LineageOS/android_frameworks_base/commit/19dc7642fe849e85abe886b9340b5dda52e21885 364607 #P_asb_2023-08 ActivityManager#killBackgroundProcesses can kill caller's own app only
-https://github.com/LineageOS/android_frameworks_base/commit/1537cadd2966e0ea2d188cd3e96af6287bb473c6 364613 #P_asb_2023-08 Verify URI permissions in MediaMetadata
-https://github.com/LineageOS/android_frameworks_base/commit/507937f96405b8530f24c7625b5f5f18f7a0df55 364614 #P_asb_2023-08 Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used
-https://github.com/LineageOS/android_frameworks_base/commit/2e64cb078e9e11e8310c0b589a6edd429b9c2f16 364615 #P_asb_2023-08 Resolve StatusHints image exploit across user.
-
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/7e0adcb2073a2549aa901ecc40de254202a1eded 366126 #P_asb_2023-09 Fix Segv on unknown address error flagged by fuzzer test.
-https://github.com/LineageOS/android_frameworks_base/commit/383b016298865df13c1d1ead7049a9c0a73cb973 366127 #P_asb_2023-09 Forbid granting access to NLSes with too-long component names
-https://github.com/LineageOS/android_frameworks_native/commit/4d3c579105e1a98abc2868723928dea280a93076 366129 #P_asb_2023-09 Allow sensors list to be empty
-https://github.com/LineageOS/android_packages_services_Telephony/commit/114c9d5475962cd63ebf8f246c2c2f4a9c7fddf1 366130 #P_asb_2023-09 Fixed leak of cross user data in multiple settings.
-https://github.com/LineageOS/android_system_bt/commit/f9ba876145b612b684f5b966ab524d7b5b7a783c 366131 #P_asb_2023-09 Fix an integer overflow bug in avdt_msg_asmbl
-https://github.com/LineageOS/android_system_bt/commit/862350fa3b8fc51bcdd8331352f28cd6cac4bf1d 366132 #P_asb_2023-09 Fix integer overflow in build_read_multi_rsp
-https://github.com/LineageOS/android_system_bt/commit/db6c02ecbc377437585b56c310e2847661dd557c 366133 #P_asb_2023-09 Fix potential abort in btu_av_act.cc
-https://github.com/LineageOS/android_system_bt/commit/9b06f046f58bd82f9df6592c1a45ade8075608f9 366134 #P_asb_2023-09 Fix reliable write.
-https://github.com/LineageOS/android_system_bt/commit/9ac8d616f369513b0ef4f466eded252a4511898d 366135 #P_asb_2023-09 Fix UAF in gatt_cl.cc
-https://github.com/LineageOS/android_packages_apps_Settings/commit/acfa0cd4e0551d07fab0511cfb84462e70a48b53 366136 #P_asb_2023-09 Prevent non-system IME from becoming device admin
-https://github.com/LineageOS/android_packages_apps_Trebuchet/commit/0c9ab1418476b9aab2830f5b3f9d4ee7be3714fd 366137 #P_asb_2023-09 Fix permission issue in legacy shortcut
-https://github.com/LineageOS/android_frameworks_base/commit/3f429c322504732c25e1d92bd57fecdd8a7e5d5b 366128 #P_asb_2023-09 Update AccountManagerService checkKeyIntentParceledCorrectly.
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/8489bb9206314ce3be439f374704204626bd40ca 370695 #P_asb_2023-10 Verify URI Permissions in Autofill RemoteViews
-https://github.com/LineageOS/android_frameworks_base/commit/aecf51e67aa3b540f86d12164be8d66e12ca47f2 370697 #P_asb_2023-10 Disallow loading icon from content URI to PipMenu
-https://github.com/LineageOS/android_frameworks_base/commit/71c5804bc372c58c4f7a1b01905618cb5edb2dda 370699 #P_asb_2023-10 Revert "Dismiss keyguard when simpin auth'd and..."
-https://github.com/LineageOS/android_packages_apps_Settings/commit/e7401f49ebfc563aa5fcd9aaa9981a235557d1b4 370700 #P_asb_2023-10 Restrict ApnEditor settings
-https://github.com/LineageOS/android_external_libxml2/commit/2bd551871a645e43a75ce6065598d22b89b80a21 370701 #P_asb_2023-10 malloc-fail: Fix OOB read after xmlRegGetCounter
-https://github.com/LineageOS/android_frameworks_base/commit/ae25f45e664b47e74fc9d73bc1b4292e6721dd7a 370693 #P_asb_2023-10 RingtoneManager: verify default ringtone is audio
-https://github.com/LineageOS/android_frameworks_base/commit/7adb3e0e1d591aeabccc5edfa624a591a3428a3d 370694 #P_asb_2023-10 Do not share key mappings with JNI object
-https://github.com/LineageOS/android_frameworks_base/commit/0fb320aef79861cb612fcd48585571f1715616fe 370696 #P_asb_2023-10 Fix KCM key mapping cloning
-https://github.com/LineageOS/android_frameworks_base/commit/48e0cbe76661b6b4c8edb2950a572694947b5641 370698 #P_asb_2023-10 Fixing DatabaseUtils to detect malformed UTF-16 strings
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_system_ca-certificates/commit/6f06eccd9ef3d37a2d9d52d1c925c3e71f525b14 374916 #P_asb_2023-11 Remove E-Tugra certificates.
-https://github.com/LineageOS/android_packages_services_BuiltInPrintService/commit/4302a583e82fa5bd76315077688818e53df98f20 374919 #P_asb_2023-11 Adjust APIs for CUPS 2.3.3
-https://github.com/LineageOS/android_packages_providers_TelephonyProvider/commit/3d07f3a1821c0953d156206e288bb484a0c0f399 374920 #P_asb_2023-11 Block access to sms/mms db from work profile.
-https://github.com/LineageOS/android_frameworks_base/commit/e696b2932c41ab89f4910abc5a626c8e9b8d8543 374921 #P_asb_2023-11 Fix BAL via notification.publicVersion
-https://github.com/LineageOS/android_frameworks_av/commit/62ae30fad8c644b492393eb8c1eec2867cc73b07 374924 #P_asb_2023-11 Fix for heap buffer overflow issue flagged by fuzzer test.
-https://github.com/LineageOS/android_external_libcups/commit/383806fb90e7246d31241ab11332f3c0172e2f17 374932 #P_asb_2023-11 Upgrade libcups to v2.3.1
-https://github.com/LineageOS/android_external_libcups/commit/af78634c7babca00f4a5b1650b817b36be4e94dd 374933 #P_asb_2023-11 Upgrade libcups to v2.3.3
-https://github.com/LineageOS/android_frameworks_base/commit/1c5bf358397ad6a337d375fbc8dba4d98a50eca8 374922 #P_asb_2023-11 Use type safe API of readParcelableArray
-https://github.com/LineageOS/android_frameworks_base/commit/64de82f91e01d8d7d4224c737efe915397a904d2 374923 #P_asb_2023-11 [SettingsProvider] verify ringtone URI before setting
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/5e50aa57f52b08f4cb07a6a3f98698f2077a9cbf 377765 #P_asb_2023-12 httplive: fix use-after-free
-https://github.com/LineageOS/android_frameworks_base/commit/73913dfae62f0c93147896ab07232417cff467ee 377766 #P_asb_2023-12 Visit Uris added by WearableExtender
-https://github.com/LineageOS/android_frameworks_base/commit/ac1ed7557b197952a6e00eb36da31e79d7bf78a4 377769 #P_asb_2023-12 Use readUniqueFileDescriptor in incidentd service
-https://github.com/LineageOS/android_frameworks_base/commit/4ca5de2bda12925a28a59a1dffaccba045b0f9cb 377771 #P_asb_2023-12 Revert "On device lockdown, always show the keyguard"
-https://github.com/LineageOS/android_frameworks_base/commit/059ed6a3d856caee5896d94d9ea26f90c6117c93 377773 #P_asb_2023-12 Updated: always show the keyguard on device lockdown
-https://github.com/LineageOS/android_packages_apps_Bluetooth/commit/3b53fae30442369bda8cd858f5b0ac697b9cd4ec 377774 #P_asb_2023-12 Fix UAF in ~CallbackEnv
-https://github.com/LineageOS/android_packages_apps_Trebuchet/commit/02e99b157f05f8fbabb9c2457e387842ccad0bed 377775 #P_asb_2023-12 Fix permission bypass in legacy shortcut
-https://github.com/LineageOS/android_packages_services_Telecomm/commit/7ef90cb74da31eb165fc624f479b02cf6df2ebda 377776 #P_asb_2023-12 Resolve account image icon profile boundary exploit.
-https://github.com/LineageOS/android_system_bt/commit/26fe8da32584d6f639124e3ca8a7cbdbe5c60d89 377777 #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [1]
-https://github.com/LineageOS/android_system_bt/commit/6b208d0624e05bb96bffbca43e18a03dc37d21dd 377778 #P_asb_2023-12 Reject access to secure services authenticated from temp bonding [2]
-https://github.com/LineageOS/android_system_bt/commit/66a09ccfd76de30e03a843df140d7851be013052 377779 #P_asb_2023-12 Reject access to secure service authenticated from a temp bonding [3]
-https://github.com/LineageOS/android_system_bt/commit/95161565e5bf426333102097a92a8f654c10e74a 377780 #P_asb_2023-12 Reorganize the code for checking auth requirement
-https://github.com/LineageOS/android_system_bt/commit/037c9934224eabab778ee4cc197a46b64396633c 377781 #P_asb_2023-12Enforce authentication if encryption is required
-https://github.com/LineageOS/android_system_bt/commit/80a300fa626f6c5e8e7a595469f09adc307aee40 377782 #P_asb_2023-12 Fix timing attack in BTM_BleVerifySignature
-https://github.com/LineageOS/android_frameworks_base/commit/c78cee7f1c921860ac3253812548f46663383a37 377767 #P_asb_2023-12 Drop invalid data.
-https://github.com/LineageOS/android_frameworks_base/commit/c58b86b918ab7085f17215883cc110ca3362235f 377768 #P_asb_2023-12 Require permission to unlock keyguard
-https://github.com/LineageOS/android_frameworks_base/commit/b18f4518109c2f7a4c936321db87f5245b3143f3 377770 #P_asb_2023-12 Validate userId when publishing shortcuts
-https://github.com/LineageOS/android_frameworks_base/commit/98fc501deb893768aeff55006ce445f688a88203 377772 #P_asb_2023-12 Adding in verification of calling UID in onShellCommand
-https://github.com/LineageOS/android_system_netd/commit/02458b0a19ce2d3214a00f9779bd36868541b7ca 378480 #P_asb_2023-12 Fix Heap-use-after-free in MDnsSdListener::Monitor::run
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/978191d5fc0ede5bc11b8af2cfa2469a30ad919d 379788 #P_asb_2024-01 Fix convertYUV420Planar16ToY410 overflow issue for unsupported cropwidth.
-https://github.com/LineageOS/android_frameworks_base/commit/44ce07024742aaae46a7191cd15e5ac68d209049 379789 #P_asb_2024-01 Dismiss keyguard when simpin auth'd and...
-https://github.com/LineageOS/android_frameworks_base/commit/63e443bfb107da3df0e37863e34c4b947052a6c1 379790 #P_asb_2024-01 Ensure finish lockscreen when usersetup incomplete
-https://github.com/LineageOS/android_frameworks_base/commit/70f50825ec98cd35d38e45eea69aa7ed8f51556a 379791 #P_asb_2024-01 Truncate user data to a limit of 500 characters
-https://github.com/LineageOS/android_frameworks_base/commit/9001132c18c0eb2a6478939e1bdbbe6778af1ae3 379792 #P_asb_2024-01 Validate component name length before requesting notification access.
-https://github.com/LineageOS/android_frameworks_base/commit/1cf5c05eaaff574e8dceb0c1a75ad02d0c669891 379793 #P_asb_2024-01 Log to detect usage of whitelistToken when sending non-PI target
-https://github.com/LineageOS/android_frameworks_base/commit/5948fb2aef0547db38f2f9df47b6fad736ba72b0 379794 #P_asb_2024-01 Fix vulnerability that allowed attackers to start arbitary activities
-https://github.com/LineageOS/android_system_bt/commit/e65eb2fdab8644f2e7885a628f6af9244ceed813 379796 #P_asb_2024-01 Fix some OOB errors in BTM parsing
-https://github.com/LineageOS/android_frameworks_base/commit/309033664a4fbb6200b3fe48d33e8f63becee810 379980 #P_asb_2024-01 Fix ActivityManager#killBackgroundProcesses permissions
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/a42e0fc335d448e646309745a8d412d984748479 383562 #P_asb_2024-02 Update mtp packet buffer
-https://github.com/LineageOS/android_frameworks_base/commit/6f5e6f86263c3db753c6d58f516070a45e30b619 383563 #P_asb_2024-02 Unbind TileService onNullBinding
-https://github.com/LineageOS/android_system_bt/commit/14e35c7cf40595a6b1ff1d2e92f8b53fb356b3dc 383565 #P_asb_2024-02 Fix an OOB bug in btif_to_bta_response and attp_build_value_cmd
-https://github.com/LineageOS/android_system_bt/commit/37ce9a968b579a87640d40e50ec91abe04101f3c 383566 #P_asb_2024-02 Fix an OOB write bug in attp_build_read_by_type_value_cmd
-https://github.com/LineageOS/android_packages_providers_DownloadProvider/commit/d1a6862647428e9c973f4c21adc83656c5ac98f9 383567 #P_asb_2024-02 Consolidate queryChildDocumentsXxx() implementations
-
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_av/commit/cc12a31fcbd0deddd5a74b7be121baf835ecf6dc 385670 #P_asb_2024-03 Validate OMX Params for VPx encoders
-https://github.com/LineageOS/android_frameworks_av/commit/ed62ccd9520a671d2fb900d236f5bc5ad16a1e7c 385671 #P_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue
-https://github.com/LineageOS/android_frameworks_base/commit/0254ee96d60cd80a52ce583c90486d6ca1549fb6 385672 #P_asb_2024-03 Resolve custom printer icon boundary exploit.
-https://github.com/LineageOS/android_frameworks_base/commit/3cbbcd611ff83ef7a0f811d04f0478f2760ae891 385673 #P_asb_2024-03 Disallow system apps to be installed/updated as instant.
-https://github.com/LineageOS/android_frameworks_base/commit/8befe29745f94a8d80f59f0d644315c5424c8eb6 385674 #P_asb_2024-03 Close AccountManagerService.session after timeout.
-https://github.com/LineageOS/android_system_bt/commit/fbf12851fa55267f8b654f0cd1337f9f98f83c4b 385675 #P_asb_2024-03 Fix OOB caused by invalid SMP packet length
-https://github.com/LineageOS/android_system_bt/commit/73c18d6ce8333f787a4cedb24d247b071bdbf078 385676 #P_asb_2024-03 Fix an OOB bug in smp_proc_sec_req
-https://github.com/LineageOS/android_system_bt/commit/42ede61231b6b1a507cbc254827ff10dd5ae8c20 385677 #P_asb_2024-03 Reland: Fix an OOB write bug in attp_build_value_cmd
-https://github.com/LineageOS/android_system_bt/commit/3683c921ab4afd4f2f6bef8a49cbfda227ce081f 385678 #P_asb_2024-03 Fix a security bypass issue in access_secure_service_from_temp_bond
-
-
-
-
-
-
-
-https://github.com/LineageOS/android_frameworks_base/commit/e3d632959e2606a909427e4f717cd3a6cc14d4c6 389269 #P_asb_2024-04 isUserInLockDown can be true when there are other strong auth requirements
-https://github.com/LineageOS/android_frameworks_base/commit/1010f9aae741c4b5e8400709a273910b9818f4ba 389270 #P_asb_2024-04 Fix security vulnerability that creates user with no restrictions when accountOptions are too long.
-
-
diff --git a/Patches/Common/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch b/Patches/Common/android_external_hardened_malloc/0001-Broken_Cameras-1.patch
similarity index 100%
rename from Patches/Common/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch
rename to Patches/Common/android_external_hardened_malloc/0001-Broken_Cameras-1.patch
diff --git a/Patches/Common/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch b/Patches/Common/android_external_hardened_malloc/0001-Broken_Cameras-2.patch
similarity index 100%
rename from Patches/Common/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch
rename to Patches/Common/android_external_hardened_malloc/0001-Broken_Cameras-2.patch
diff --git a/Patches/Common/android_external_hardened_malloc-modern/0002-Broken_Displays.patch b/Patches/Common/android_external_hardened_malloc/0002-Broken_Displays.patch
similarity index 100%
rename from Patches/Common/android_external_hardened_malloc-modern/0002-Broken_Displays.patch
rename to Patches/Common/android_external_hardened_malloc/0002-Broken_Displays.patch
diff --git a/Patches/Common/android_external_hardened_malloc-modern/0003-Broken_Audio.patch b/Patches/Common/android_external_hardened_malloc/0003-Broken_Audio.patch
similarity index 100%
rename from Patches/Common/android_external_hardened_malloc-modern/0003-Broken_Audio.patch
rename to Patches/Common/android_external_hardened_malloc/0003-Broken_Audio.patch
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10000_Tracfone-ATT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10000_Tracfone-ATT.xml
deleted file mode 100644
index 809cd449..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10000_Tracfone-ATT.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="50000" />
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10001_Tracfone-TMO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10001_Tracfone-TMO.xml
deleted file mode 100644
index 886bb5cf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10001_Tracfone-TMO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10004_sprintprepaid-us.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10004_sprintprepaid-us.xml
deleted file mode 100644
index 592215ff..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10004_sprintprepaid-us.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10008_Tracfone-VZW.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10008_Tracfone-VZW.xml
deleted file mode 100644
index 67f5eaf5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10008_Tracfone-VZW.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <boolean name="enabledTransID" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10012_Red-Pocket-ATT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10012_Red-Pocket-ATT.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10012_Red-Pocket-ATT.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10030_TANGO-US.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10030_TANGO-US.xml
deleted file mode 100644
index 92c2be7c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10030_TANGO-US.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="inflate_signal_strength_bool" value="true"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="recipientLimit" value="10"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="ims_dtmf_tone_delay_int" value="120"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="05A54ED7D31A99557BF99D0E2F5E15A89D43E46387C22B30F2014F04432500FA:com.tango.mobile,com.tango.update,com.tango.entitlements"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10031_TANGO-UK.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10031_TANGO-UK.xml
deleted file mode 100644
index 2acf3bc4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10031_TANGO-UK.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="inflate_signal_strength_bool" value="true"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="10"/>
-    <int name="ims_dtmf_tone_delay_int" value="120"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="05A54ED7D31A99557BF99D0E2F5E15A89D43E46387C22B30F2014F04432500FA:com.tango.mobile,com.tango.update,com.tango.entitlements"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1008_Société-Réunionnaise-du-Radiotéléphone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1008_Société-Réunionnaise-du-Radiotéléphone.xml
deleted file mode 100644
index 0fbb256c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1008_Société-Réunionnaise-du-Radiotéléphone.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1010_Telekom-Romania.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1010_Telekom-Romania.xml
deleted file mode 100644
index 32bc6047..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1010_Telekom-Romania.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<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="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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1011_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1011_Orange.xml
deleted file mode 100644
index 46db5be5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1011_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.contultauorange,com.orange.phone,ro.orange.yoxo,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.contultauorange</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1012_Telenor-doo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1012_Telenor-doo.xml
deleted file mode 100644
index ca40af05..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1012_Telenor-doo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1013_Telekom-Srbija-ad.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1013_Telekom-Srbija-ad.xml
deleted file mode 100644
index ca40af05..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1013_Telekom-Srbija-ad.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1014_Vip-mobile-doo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1014_Vip-mobile-doo.xml
deleted file mode 100644
index ca40af05..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1014_Vip-mobile-doo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1096_CAT-CDMA.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1096_CAT-CDMA.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1096_CAT-CDMA.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1097_AIS-GSM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1097_AIS-GSM.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1097_AIS-GSM.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1098_AIS.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1098_AIS.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1098_AIS.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10_T-Mobile-ME.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10_T-Mobile-ME.xml
deleted file mode 100644
index eea2a192..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_10_T-Mobile-ME.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml
deleted file mode 100644
index cac305ed..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1185_Cellular-Network-Partnership-dba-Pioneer-Cellular.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1228800"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1187_AT&T.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1187_AT&T.xml
deleted file mode 100644
index e483de7f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1187_AT&T.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_hold_call_during_emergency_bool" value="false"/>
-    <boolean name="allow_merging_rtt_calls_bool" value="true"/>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="csp_enabled_bool" value="true"/>
-    <boolean name="display_hd_audio_property_bool" value="false"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="ims.use_tel_uri_for_pidf_xml" value="true" />
-    <boolean name="ims.rcs_request_forbidden_by_sip_489_bool" value="true" />
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="show_4g_for_3g_data_icon_bool" value="true"/>
-    <boolean name="support_pause_ims_video_calls_bool" value="false"/>
-    <boolean name="rtt_supported_while_roaming_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <int name="ims_dtmf_tone_delay_int" value="120"/>
-    <int name="default_mtu_int" value="1430"/>
-    <string name="carrier_name_string">AT&amp;T</string>
-    <string-array name="non_roaming_operator_string_array" num="7">
-        <item value="310"/>
-        <item value="311"/>
-        <item value="312"/>
-        <item value="313"/>
-        <item value="314"/>
-        <item value="315"/>
-        <item value="316"/>
-    </string-array>
-    <string-array name="roaming_operator_string_array" num="5">
-        <item value="310110"/>
-        <item value="310140"/>
-        <item value="310400"/>
-        <item value="310470"/>
-        <item value="311170"/>
-    </string-array>
-    <int-array name="radio_restart_failure_causes_int_array" num="1">
-        <item value="36"/>
-    </int-array>
-    <string-array name="ims_reasoninfo_mapping_string_array" num="2">
-        <item value="352|emergency calls over wifi not allowed in this location|1622"/>
-        <item value="332|service not allowed in this location|1623"/>
-    </string-array>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,any,30</string>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="50000" />
-    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1190_Cincinnati-Bell-Wireless-LLC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1190_Cincinnati-Bell-Wireless-LLC.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1190_Cincinnati-Bell-Wireless-LLC.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1193_North-East-Cellular-Inc.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1193_North-East-Cellular-Inc.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1193_North-East-Cellular-Inc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_11_Slovak-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_11_Slovak-Telekom.xml
deleted file mode 100644
index ada4c1d0..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_11_Slovak-Telekom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml
deleted file mode 100644
index 2745db47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1243_Easterbrooke-Cellular-Corporation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1246_Alltel-Communications-Inc.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1246_Alltel-Communications-Inc.xml
deleted file mode 100644
index a41269c8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1246_Alltel-Communications-Inc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="mmsCloseConnection" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml
deleted file mode 100644
index cac305ed..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1263_Illinois-Valley-Cellular.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1228800"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1329_Vodafone-Albania.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1329_Vodafone-Albania.xml
deleted file mode 100644
index c66b6282..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1329_Vodafone-Albania.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="default_vm_number_string">135</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1338_Claro-AR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1338_Claro-AR.xml
deleted file mode 100644
index e8fde2f2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1338_Claro-AR.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1341_Personal-AR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1341_Personal-AR.xml
deleted file mode 100644
index 06ea4228..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1341_Personal-AR.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="E79D68A3BA64DF7381236B896372DBFD7B2BA55D046C5B3703549E653EBBADF7:ar.com.personal"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1344_Drei.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1344_Drei.xml
deleted file mode 100644
index a9278fb0..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1344_Drei.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="non_roaming_operator_string_array" num="2">
-        <item value="23203"/>
-        <item value="23205"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1345_Telstra.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1345_Telstra.xml
deleted file mode 100644
index 49218c3c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1345_Telstra.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="2097152"/>
-    <int name="default_mtu_int" value="1400"/>
-    <string name="default_vm_number_string">+61101</string>
-    <string-array name="carrier_metered_apn_types_strings" num="3">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="read_only_apn_types_string_array" num="0"/>
-    <int-array name="lte_rsrp_thresholds_int_array" num="4">
-        <item value="-120"/>
-        <item value="-115"/>
-        <item value="-100"/>
-        <item value="-90"/>
-    </int-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1358_MOBI'S-(Mobilina-Srpske).xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1358_MOBI'S-(Mobilina-Srpske).xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1358_MOBI'S-(Mobilina-Srpske).xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1366_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1366_Orange.xml
deleted file mode 100644
index f7bc59f1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1366_Orange.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="non_roaming_operator_string_array" num="1">
-        <item value="20605"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,com.orange.myorange.obe,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.obe</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1368_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1368_Orange.xml
deleted file mode 100644
index cf8cb8ee..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1368_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.obf,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.obf</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1383_Nextel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1383_Nextel.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1383_Nextel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1385_TIM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1385_TIM.xml
deleted file mode 100644
index cd359b8e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1385_TIM.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="815641A2394999AA9AD4D499BFBD23CD073024D13A8A8639F834B5166C80B8DB:br.com.timbrasil.meutim"/>
-        <item value="5D4369640AD4D8972B75C831DC5C135B700BB1E793CEB7EC89FA6AA0469143CC:br.com.timbrasil.meutim"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1389_Oi.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1389_Oi.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1389_Oi.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml
deleted file mode 100644
index cddc3679..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_13_Mkedonski-Telecom-AD-Skopje.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="display_hd_audio_property_bool" value="false"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="102400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1403_Rogers.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1403_Rogers.xml
deleted file mode 100644
index 3331a8e6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1403_Rogers.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <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"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="default_mtu_int" value="1430"/>
-    <string name="carrier_name_string">Rogers</string>
-    <string name="gps.lpp_profile">2</string>
-    <string-array name="read_only_apn_types_string_array" num="1">
-        <item value="*"/>
-    </string-array>
-    <string-array name="non_roaming_operator_string_array" num="5">
-        <item value="302220"/>
-        <item value="302370"/>
-        <item value="302610"/>
-        <item value="302660"/>
-        <item value="302780"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1404_TELUS-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1404_TELUS-Mobility.xml
deleted file mode 100644
index 89bf3bdf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1404_TELUS-Mobility.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="always_play_remote_hold_tone_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="10"/>
-    <int name="smsToMmsTextThreshold" value="5"/>
-    <int name="default_mtu_int" value="1410"/>
-    <string name="gps.lpp_profile">3</string>
-    <string-array name="read_only_apn_types_string_array" num="1">
-        <item value="*"/>
-    </string-array>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="78"/>
-    </int-array>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
-    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
-    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1410_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1410_Orange.xml
deleted file mode 100644
index 43b33c61..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1410_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ocf,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ocf</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1420_Claro-GT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1420_Claro-GT.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1420_Claro-GT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1421_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1421_Orange.xml
deleted file mode 100644
index 16d6e994..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1421_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.oci,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.oci</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1428_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1428_Movistar.xml
deleted file mode 100644
index 1f892261..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1428_Movistar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="73002"/>
-    </string-array>
-    <boolean name="enabledMMS" value="false"/>
-    <boolean name="enableGroupMms" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1429_Claro-CL.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1429_Claro-CL.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1429_Claro-CL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1430_WOM-CL.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1430_WOM-CL.xml
deleted file mode 100644
index 428e9419..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1430_WOM-CL.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="9A038751D1788E0D28A19055030BCFA945BC2984F8EBBDFC16A980EFD82FF4C5:cl.wom.transformacion.appwommobile"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1434_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1434_Orange.xml
deleted file mode 100644
index 3e75b924..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1434_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ocm,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ocm</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1435_China-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1435_China-Mobile.xml
deleted file mode 100644
index f5fae856..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1435_China-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="support_tdscdma_bool" value="true"/>
-    <boolean name="allow_add_call_during_video_call" value="false" />
-    <boolean name="allow_hold_video_call_bool" value="false" />
-    <boolean name="support_video_conference_call_bool" value="false"/>
-    <int name="default_mtu_int" value="1400"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1436_China-Unicom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1436_China-Unicom.xml
deleted file mode 100644
index dcef6913..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1436_China-Unicom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1442_Claro-CO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1442_Claro-CO.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1442_Claro-CO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1449_O2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1449_O2.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1449_O2.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1452_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1452_Vodafone.xml
deleted file mode 100644
index c83b6056..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1452_Vodafone.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="1">
-      <item value="E4441B21B7374947FBA0CB34EEA9F600F05181056126FAC5FFEB9C34A2841C88:com.zentity.vodafone"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1453_Telefonica.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1453_Telefonica.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1453_Telefonica.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1454_o2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1454_o2.xml
deleted file mode 100644
index dc21cc35..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1454_o2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="614400"/>
-    <string name="default_vm_number_string">+491793000333</string>
-    <boolean name="use_only_dialed_sim_ecc_list_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1464_Telenor.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1464_Telenor.xml
deleted file mode 100644
index 3239345c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1464_Telenor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="2097152"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1466_3.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1466_3.xml
deleted file mode 100644
index 732b7b5f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1466_3.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="editable_voicemail_number_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1467_Claro-RD.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1467_Claro-RD.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1467_Claro-RD.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1472_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1472_Movistar.xml
deleted file mode 100644
index ee74d287..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1472_Movistar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="74000"/>
-    </string-array>
-    <boolean name="enabledMMS" value="false"/>
-    <boolean name="enableGroupMms" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1473_Claro-EC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1473_Claro-EC.xml
deleted file mode 100644
index ef1cea32..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1473_Claro-EC.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
-
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1487_Bouygues-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1487_Bouygues-Telecom.xml
deleted file mode 100644
index 6170343a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1487_Bouygues-Telecom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="supportHttpCharsetHeader" value="false"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="a0058f6467628ea2031c4c9d8519abecb2671f6a1752b15a89369cdcb8d2952b:fr.bouyguestelecom.ecm.android"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1492_O2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1492_O2.xml
deleted file mode 100644
index 48b1b3ac..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1492_O2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string">901</string>
-    <string-array name="non_roaming_operator_string_array" num="8">
-        <item value="23420"/>
-        <item value="23426"/>
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-    <int-array name="radio_restart_failure_causes_int_array" num="1">
-        <item value="55"/>
-    </int-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1495_Spitfire.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1495_Spitfire.xml
deleted file mode 100644
index f42541a8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1495_Spitfire.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
-
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_14_A1.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_14_A1.xml
deleted file mode 100644
index 9c62a46f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_14_A1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="default_vm_number_string">66477</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="23201"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1505_Three-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1505_Three-Mobile.xml
deleted file mode 100644
index 8a1af3ae..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1505_Three-Mobile.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="default_mtu_int" value="1440"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string-array name="non_roaming_operator_string_array" num="8">
-        <item value="23410"/>
-        <item value="23426"/>
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1507_Manx-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1507_Manx-Telecom.xml
deleted file mode 100644
index ccc8cbf3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1507_Manx-Telecom.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="default_vm_number_string">121</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1520_Claro-GT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1520_Claro-GT.xml
deleted file mode 100644
index ebbcbe95..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1520_Claro-GT.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="3">
-        <item value="*1"/>
-        <item value="*5"/>
-        <item value="*9"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1529_Tele2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1529_Tele2.xml
deleted file mode 100644
index 5d8b4e20..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1529_Tele2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="21901"/>
-    </string-array>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1530_A1Tomato.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1530_A1Tomato.xml
deleted file mode 100644
index ca40af05..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1530_A1Tomato.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1534_Telenor.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1534_Telenor.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1534_Telenor.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1535_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1535_Vodafone.xml
deleted file mode 100644
index a85075f4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1535_Vodafone.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="default_mtu_int" value="1358"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1543_Reliance.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1543_Reliance.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1543_Reliance.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1545_BPL-Mobile-Communications-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1545_BPL-Mobile-Communications-Ltd.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1545_BPL-Mobile-Communications-Ltd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1549_Bharat-Sanchar-Nigam-Ltd-(BSNL).xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1549_Bharat-Sanchar-Nigam-Ltd-(BSNL).xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1549_Bharat-Sanchar-Nigam-Ltd-(BSNL).xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1550_RPG-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1550_RPG-Cellular.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1550_RPG-Cellular.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1551_Aircel-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1551_Aircel-Ltd.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1551_Aircel-Ltd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1556_Mahanagar-Telephone-Nigam-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1556_Mahanagar-Telephone-Nigam-Ltd.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1556_Mahanagar-Telephone-Nigam-Ltd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1557_Hexicom-India.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1557_Hexicom-India.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1557_Hexicom-India.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1559_Reliable-Internet-Services-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1559_Reliable-Internet-Services-Ltd.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1559_Reliable-Internet-Services-Ltd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1566_Tal-hf.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1566_Tal-hf.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1566_Tal-hf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1567_Islandssimi-GSM-ehf.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1567_Islandssimi-GSM-ehf.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1567_Islandssimi-GSM-ehf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1573_Wind.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1573_Wind.xml
deleted file mode 100644
index f1a19179..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1573_Wind.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-  <string-array name="carrier_certificate_string_array" num="3">
-    <item value="7A6D2E2EDEA23A93FA95A447535675CFB543919698196FB720B1520658D25DC7:it.h3g.webfamily"/>
-    <item value="A69A419CFB5FB8344D2AEDCED6BC2A7FCB74F85161BCA9265C54E95E478839C3:it.wind.myWind"/>
-    <item value="998DA7CED0E1A3A14E51FAEF1F8608A494BDA791B6609A1C5E599F9B64F01674:it.very.mobile"/>
-  </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1575_3.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1575_3.xml
deleted file mode 100644
index f1a19179..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1575_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-  <string-array name="carrier_certificate_string_array" num="3">
-    <item value="7A6D2E2EDEA23A93FA95A447535675CFB543919698196FB720B1520658D25DC7:it.h3g.webfamily"/>
-    <item value="A69A419CFB5FB8344D2AEDCED6BC2A7FCB74F85161BCA9265C54E95E478839C3:it.wind.myWind"/>
-    <item value="998DA7CED0E1A3A14E51FAEF1F8608A494BDA791B6609A1C5E599F9B64F01674:it.very.mobile"/>
-  </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1581_au.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1581_au.xml
deleted file mode 100644
index 01daff67..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1581_au.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="disable_dun_apn_while_roaming_with_preset_apn_bool" value="true"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="default_mtu_int" value="1420"/>
-    <string name="carrier_name_string">au</string>
-    <string-array name="carrier_certificate_string_array" num="4">
-        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
-        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
-        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
-        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_15_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_15_Vodafone.xml
deleted file mode 100644
index 149dea29..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_15_Vodafone.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="default_mtu_int" value="1358"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1606_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1606_Orange.xml
deleted file mode 100644
index 5e508cb4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1606_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone.mea,com.orange.myorange.omg,com.orange.update"/>
-    </string-array>
-<string name="config_plans_package_override_string">com.orange.myorange.omg</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1608_Cosmofon.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1608_Cosmofon.xml
deleted file mode 100644
index 90d1e436..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1608_Cosmofon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="131072"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1609_Nov-Operator.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1609_Nov-Operator.xml
deleted file mode 100644
index 158f0931..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1609_Nov-Operator.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="256000"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1641_Claro-NI.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1641_Claro-NI.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1641_Claro-NI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1644_KPNTelfort.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1644_KPNTelfort.xml
deleted file mode 100644
index fa2f5357..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1644_KPNTelfort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="non_roaming_operator_string_array" num="1">
-        <item value="20408"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1647_Claro-PE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1647_Claro-PE.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1647_Claro-PE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1651_Digicel-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1651_Digicel-Ltd.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1651_Digicel-Ltd.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1658_Plus.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1658_Plus.xml
deleted file mode 100644
index 966e58ed..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1658_Plus.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="e3266a6cf0b5e2ae1cf2727f321441e4e07c5adcf328296ed23b819760fa61e1:com.n7mobile.plusapps,com.n7mobile.pluswidget"/>
-        <item value="8a825148825f2c8502caad446b5582793b0cfda1cd220581ea80b11ad833c55e:com.n7mobile.plusapps,com.n7mobile.pluswidget"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1659_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1659_Orange.xml
deleted file mode 100644
index 7ce054a4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1659_Orange.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <!-- 0 is SERVICE_CLASS_NONE -->
-    <int name="call_barring_default_service_class_int" value="0"/>
-    <string-array name="carrier_certificate_string_array" num="2">
-      <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,pl.orange.mojeorange,com.orange.update"/>
-      <item value="b71c30c980ee10e1c53fe17f21323d4a518f1bffcc2917df26a9098364aa9b26:com.orange.rn.dop"/>
-    </string-array>
-    <string name="config_plans_package_override_string">pl.orange.mojeorange</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1668_NOS.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1668_NOS.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1668_NOS.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1670_MEO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1670_MEO.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1670_MEO.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1673_Claro-PY.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1673_Claro-PY.xml
deleted file mode 100644
index e8fde2f2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1673_Claro-PY.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1676_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1676_Orange.xml
deleted file mode 100644
index 45eb5945..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1676_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.ionicframework.orangeetmoiorm564631,com.orange.phone,com.mysosh.re,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.ionicframework.orangeetmoiorm564631</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1690_Telia-Sonera-AB.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1690_Telia-Sonera-AB.xml
deleted file mode 100644
index 2630619f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1690_Telia-Sonera-AB.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1693_3G-Infrastructure-Services-AB.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1693_3G-Infrastructure-Services-AB.xml
deleted file mode 100644
index 2630619f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1693_3G-Infrastructure-Services-AB.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1695_Telenor-Sverige-AB.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1695_Telenor-Sverige-AB.xml
deleted file mode 100644
index 2630619f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1695_Telenor-Sverige-AB.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1709_SI-Mobil.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1709_SI-Mobil.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1709_SI-Mobil.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1710_Telekom-Slovenije.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1710_Telekom-Slovenije.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1710_Telekom-Slovenije.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1712_Tusmobil-doo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1712_Tusmobil-doo.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1712_Tusmobil-doo.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1713_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1713_Orange.xml
deleted file mode 100644
index 19aba21f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1713_Orange.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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="2">
-      <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,com.orange.update"/>
-      <item value="6ae20c0e468b99d1f3d35a7cb959ab64cbcee802461ce9d38f099c90d245bfbf:sk.orange.android.orangego"/>
-    </string-array>
-    <string name="config_plans_package_override_string">sk.orange.android.orangego</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1716_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1716_Orange.xml
deleted file mode 100644
index 695cde40..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1716_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.osl,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.osl</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1721_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1721_Orange.xml
deleted file mode 100644
index fc3840d6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1721_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.osn,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.osn</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1723_ACT-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1723_ACT-Mobile.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1723_ACT-Mobile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1735_Paycell-Turkcell.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1735_Paycell-Turkcell.xml
deleted file mode 100644
index 7a6e93a6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1735_Paycell-Turkcell.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="512000"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1737_Türk-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1737_Türk-Telekom.xml
deleted file mode 100644
index 7a6e93a6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1737_Türk-Telekom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="512000"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1776_MCI.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1776_MCI.xml
deleted file mode 100644
index 6a7dac8d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1776_MCI.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="supportMmsContentDisposition" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="sendMultipartSmsAsSeparateMessages" value="true"/>
-    <boolean name="enableMultipartSMS" value="false"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1778_Mobile-Tel-Inc.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1778_Mobile-Tel-Inc.xml
deleted file mode 100644
index a41269c8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1778_Mobile-Tel-Inc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="mmsCloseConnection" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1779_Cricket-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1779_Cricket-Wireless.xml
deleted file mode 100644
index aa8f6c91..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1779_Cricket-Wireless.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_hold_call_during_emergency_bool" value="false"/>
-    <boolean name="csp_enabled_bool" value="true"/>
-    <boolean name="show_4g_for_3g_data_icon_bool" value="true"/>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="50000" />
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml
deleted file mode 100644
index 2745db47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1784_MTA-Communications-dba-MTA-Wireless.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1788_Sprint.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1788_Sprint.xml
deleted file mode 100644
index 1fec0f7e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1788_Sprint.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false"/>
-    <boolean name="apn_expand_bool" value="false"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_settings_enable_bool" value="true"/>
-    <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="show_cdma_choices_bool" value="true"/>
-    <boolean name="stk_disable_launch_browser_bool" value="true"/>
-    <boolean name="supportMmsContentDisposition" value="false"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="use_hfa_for_provisioning_bool" value="true"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <boolean name="volte_5g_limited_alert_dialog_bool" value="true"/>
-    <int name="cdma_3waycall_flash_delay_int" value="300"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="40"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-    <int name="default_mtu_int" value="1422"/>
-    <string name="carrier_eri_file_name_string">eri_310120.xml</string>
-    <string name="carrier_name_string">Sprint</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-    <string name="naiSuffix">:pcs</string>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1789_Carolina-West-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1789_Carolina-West-Wireless.xml
deleted file mode 100644
index 2745db47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1789_Carolina-West-Wireless.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1792_West-Central-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1792_West-Central-Wireless.xml
deleted file mode 100644
index 77e6f310..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1792_West-Central-Wireless.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="csp_enabled_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml
deleted file mode 100644
index 26006332..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1802_New-Cell-Inc-dba-Cellcom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="8388608"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml
deleted file mode 100644
index cac305ed..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1813_East-Kentucky-Network-LLC-dba-Appalachian-Wireless.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1228800"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1815_Iowa-Wireless-Services-LLC-dba-I-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1815_Iowa-Wireless-Services-LLC-dba-I-Wireless.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1815_Iowa-Wireless-Services-LLC-dba-I-Wireless.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1826_Rural-Cellular-Corporation.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1826_Rural-Cellular-Corporation.xml
deleted file mode 100644
index a41269c8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1826_Rural-Cellular-Corporation.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="mmsCloseConnection" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1828_Southern-IL-RSA-Partnership-dba-First-Cellular-of-Southern-Illinois.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1828_Southern-IL-RSA-Partnership-dba-First-Cellular-of-Southern-Illinois.xml
deleted file mode 100644
index a41269c8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1828_Southern-IL-RSA-Partnership-dba-First-Cellular-of-Southern-Illinois.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="mmsCloseConnection" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1829_James-Valley.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1829_James-Valley.xml
deleted file mode 100644
index d1bfa24d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1829_James-Valley.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1258291"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1836_C-Spire.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1836_C-Spire.xml
deleted file mode 100644
index 3c7a7f02..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1836_C-Spire.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="false"/>
-    <int name="smsToMmsTextThreshold" value="-1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="sim_country_iso_override_string">us</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1839_Verizon-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1839_Verizon-Wireless.xml
deleted file mode 100644
index c849be49..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1839_Verizon-Wireless.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="aliasEnabled" value="true"/>
-    <boolean name="allowAttachAudio" value="false"/>
-    <boolean name="allow_add_call_during_video_call" value="false"/>
-    <boolean name="allow_adding_apns_bool" value="false"/>
-    <boolean name="allow_hold_in_ims_call" value="false"/>
-    <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false"/>
-    <boolean name="apn_expand_bool" value="false"/>
-    <boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
-    <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_provisioned_bool" value="true"/>
-    <boolean name="carrier_volte_provisioning_required_bool" value="true"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="disable_voice_barring_notification_bool" value="true"/>
-    <boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="editable_wfc_mode_bool" value="false"/>
-    <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enabledNotifyWapMMSC" value="true"/>
-    <boolean name="enabledTransID" value="true"/>
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
-    <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
-    <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
-    <boolean name="operator_selection_expand_bool" value="true"/>
-    <boolean name="gps.persist_lpp_mode_bool" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="rtt_upgrade_supported_for_downgraded_vt_call" value="false"/>
-    <boolean name="vt_upgrade_supported_for_downgraded_rtt_call" value="false"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="ims.enable_presence_capability_exchange_bool" value="true"/>
-    <boolean name="ims.enable_presence_publish_bool" value="true"/>
-    <boolean name="ims.use_sip_uri_for_presence_subscribe_bool" value="true"/>
-    <boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
-    <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
-    <boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
-    <boolean name="support_pause_ims_video_calls_bool" value="true"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
-    <boolean name="video_calls_can_be_hd_audio" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
-    <boolean name="world_mode_enabled_bool" value="true"/>
-    <int name="aliasMaxChars" value="48"/>
-    <int name="aliasMinChars" value="2"/>
-    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
-    <int name="lte_earfcns_rsrp_boost_int" value="6"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1258291"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="7"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <int name="default_mtu_int" value="1438"/>
-    <string name="carrier_eri_file_name_string">eri_311480.xml</string>
-    <string name="carrier_name_string">Verizon</string>
-    <string name="default_vm_number_string">*86</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-    <string name="uaProfTagName">Profile</string>
-    <string name="sim_country_iso_override_string">us</string>
-    <string-array name="boosted_lte_earfcns_string_array" num="2">
-        <item value="600-1199"/>
-        <item value="1950-2399"/>
-    </string-array>
-    <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
-        <item value="*71"/>
-        <item value="*72"/>
-    </string-array>
-    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
-        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
-        <!-- Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default. -->
-        <item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
-        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
-        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
-    </string-array>
-    <string-array name="carrier_metered_apn_types_strings" num="3">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="mms"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="dial_string_replace_string_array" num="2">
-        <item value="*611:+19085594899"/>
-        <item value="*86:+1MDN"/>
-    </string-array>
-    <string-array name="filtered_cnap_names_string_array" num="2">
-        <item value="WIRELESS CALLER"/>
-        <item value="UNKNOWN NAME"/>
-    </string-array>
-    <string-array name="ims_reasoninfo_mapping_string_array" num="10">
-        <item value="332|simultaneous call limit has already been reached|1403"/>
-        <item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403"/>
-        <item value="338|another device sent all devices busy response|1404"/>
-        <item value="501|call completion elsewhere|1014"/>
-        <item value="501|call has been pulled by another device|1016"/>
-        <item value="510|call has been pulled by another device|1016"/>
-        <item value="501|another device sent all devices busy response|1404"/>
-        <item value="510|another device sent all devices busy response|1404"/>
-        <item value="1014|call has been pulled by another device|1016"/>
-        <item value="*|Call is dropped due to Wi-Fi signal is degraded|1407"/>
-    </string-array>
-    <string-array name="read_only_apn_fields_string_array" num="20">
-        <item value="name"/>
-        <item value="proxy"/>
-        <item value="port"/>
-        <item value="user"/>
-        <item value="password"/>
-        <item value="server"/>
-        <item value="mmsc"/>
-        <item value="mmsproxy"/>
-        <item value="mmsport"/>
-        <item value="mcc"/>
-        <item value="mnc"/>
-        <item value="authtype"/>
-        <item value="type"/>
-        <item value="protocol"/>
-        <item value="roaming_protocol"/>
-        <item value="bearer"/>
-        <item value="bearer_bitmask"/>
-        <item value="carrier_enabled"/>
-        <item value="mvno_type"/>
-        <item value="mvno_match_data"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="FF82050BF6BED1F152AC1A12DC83CACBAD401775161882872C6665FC5E15C8F2:com.verizon.mips.services"/>
-        <item value="AE23A03436DF07B0CD70FE881CDA2EC1D21215D7B7B0CC68E67B67F5DF89526A:com.vzw.hss.myverizon"/>
-    </string-array>
-    <int-array name="lte_rsrp_thresholds_int_array" num="4">
-        <item value="-115"/>
-        <item value="-105"/>
-        <item value="-95"/>
-        <item value="-85"/>
-    </int-array>
-    <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
-        <item value="64"/>
-        <item value="65"/>
-        <item value="66"/>
-        <item value="76"/>
-        <item value="77"/>
-        <item value="78"/>
-        <item value="79"/>
-        <item value="80"/>
-        <item value="81"/>
-        <item value="82"/>
-        <item value="83"/>
-    </int-array>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,any,3;not_restricted_rrc_idle,not_restricted_rrc_con,2</string>
-    <string name="5g_icon_display_secondary_grace_period_string">connected_mmwave,not_restricted_rrc_idle,60</string>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="77"/>
-    </int-array>
-    <string-array name="unmetered_network_types_string_array" num="2">
-        <item value="NR_NSA_MMWAVE"/>
-        <item value="NR_SA_MMWAVE"/>
-    </string-array>
-
-    <!--The value is 0xFF03 -->
-    <int name="nr_advanced_capable_pco_id_int" value="65283"/>
-
-    <int-array name="nrarfcns_rsrp_boost_int_array" num="1">
-        <item value="6"/>
-    </int-array>
-    <string-array name="boosted_nrarfcns_string_array" num="1">
-        <item value="200000-866666"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1843_GCI-Communications-Corp.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1843_GCI-Communications-Corp.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1843_GCI-Communications-Corp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1845_Midwest-Wireless-Holdings-LLC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1845_Midwest-Wireless-Holdings-LLC.xml
deleted file mode 100644
index 1c31306d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1845_Midwest-Wireless-Holdings-LLC.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml
deleted file mode 100644
index 2745db47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1846_Iowa-RSA-No2-Ltd-Partnership.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1848_Chat-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1848_Chat-Mobility.xml
deleted file mode 100644
index f2264686..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1848_Chat-Mobility.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enabledMMS" value="true"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxImageWidth" value="4320"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml
deleted file mode 100644
index 16d9fd06..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1849_Bluegrass-Cellular-LLC.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1228800"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1853_Virgin-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1853_Virgin-Mobile.xml
deleted file mode 100644
index d1597f53..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1853_Virgin-Mobile.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="supportMmsContentDisposition" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false"/>
-    <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="40"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="cdma_3waycall_flash_delay_int" value="300"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="naiSuffix">:pcs</string>
-    <string name="carrier_eri_file_name_string">eri_311490.xml</string>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1864_Claro-UY.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1864_Claro-UY.xml
deleted file mode 100644
index e8fde2f2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1864_Claro-UY.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1873_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1873_Movistar.xml
deleted file mode 100644
index 7809576e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1873_Movistar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-  <string-array name="carrier_service_name_array" num="15">
-    <item value="At. Cliente"/>
-    <item value="Policía"/>
-    <item value="Buzón de Voz"/>
-    <item value="Saldo"/>
-    <item value="Telpago"/>
-    <item value="Club Movistar"/>
-    <item value="Chat de voz"/>
-    <item value="Entretonos"/>
-    <item value="Servicio 113"/>
-    <item value="Llamada Cobrar"/>
-    <item value="Transferencia"/>
-    <item value="Dilo"/>
-    <item value="Buzón Roaming"/>
-    <item value="*ROAM"/>
-    <item value="Saldo"/>
-  </string-array>
-  <string-array name="carrier_service_number_array" num="15">
-    <item value="811"/>
-    <item value="171"/>
-    <item value="133"/>
-    <item value="*88"/>
-    <item value="132"/>
-    <item value="*2582"/>
-    <item value="*2428"/>
-    <item value="*86667"/>
-    <item value="113"/>
-    <item value="*44"/>
-    <item value="7878"/>
-    <item value="*3456"/>
-    <item value="+584148352961"/>
-    <item value="*7626"/>
-    <item value="123"/>
-  </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1881_遠傳電信-Far-EasTone-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1881_遠傳電信-Far-EasTone-Telecom.xml
deleted file mode 100644
index a4af9bc7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1881_遠傳電信-Far-EasTone-Telecom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="support_ims_conference_event_package_bool" value="false"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1882_亞太電信-Asia-Pacific-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1882_亞太電信-Asia-Pacific-Telecom.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1882_亞太電信-Asia-Pacific-Telecom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1883_Tuntex-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1883_Tuntex-Telecom.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1883_Tuntex-Telecom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1884_中華電信_Chunghwa-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1884_中華電信_Chunghwa-Telecom.xml
deleted file mode 100644
index 785b56e6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1884_中華電信_Chunghwa-Telecom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1886_台灣之星-T-Star.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1886_台灣之星-T-Star.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1886_台灣之星-T-Star.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1887_MobiTai-Communications.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1887_MobiTai-Communications.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1887_MobiTai-Communications.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1888_台灣大哥大-Taiwan-Mobile-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1888_台灣大哥大-Taiwan-Mobile-Telecom.xml
deleted file mode 100644
index 6df2e6d9..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1888_台灣大哥大-Taiwan-Mobile-Telecom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="support_ims_conference_event_package_bool" value="false"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1889_TransAsia-Telecoms.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1889_TransAsia-Telecoms.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1889_TransAsia-Telecoms.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1890_KT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1890_KT.xml
deleted file mode 100644
index cbb47464..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1890_KT.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="allow_emergency_video_calls_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="support_conference_call_bool" value="false"/>
-    <int name="carrier_instant_lettering_length_limit_int" value="64"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="default_mtu_int" value="1450"/>
-    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
-    <string name="carrier_instant_lettering_invalid_chars_string">["&lt;&gt;\\\n]</string>
-    <string-array name="bandwidth_string_array" num="19">
-        <item value="GPRS:24,24"/>
-        <item value="EDGE:70,18"/>
-        <item value="UMTS:115,115"/>
-        <item value="CDMA-IS95A:14,14"/>
-        <item value="CDMA-IS95B:14,14"/>
-        <item value="1xRTT:30,30"/>
-        <item value="EvDo-rev.0:750,48"/>
-        <item value="EvDo-rev.A:950,550"/>
-        <item value="HSDPA:4300,620"/>
-        <item value="HSUPA:4300,1800"/>
-        <item value="HSPA:4300,1800"/>
-        <item value="EvDo-rev.B:1500,550"/>
-        <item value="eHRPD:750,48"/>
-        <item value="HSPAP:13000,3400"/>
-        <item value="TD-SCDMA:115,115"/>
-        <item value="LTE:30000,15000"/>
-        <item value="NR_NSA:563200,61440"/>
-        <item value="NR_NSA_MMWAVE:563200,614400"/>
-        <item value="NR_SA:563200,61440"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="6">
-        <item value="7117EE13C842F1009553C8B70FFF7CF30EC8F04118AE87B6722E2F05193EA09A:com.kt.olleh.servicemenu"/>
-        <item value="30BCC971FC0B69D54E7795B73EA2B11BF526E783850AFD2E73E1EE66DF120630:com.ktshow.cs"/>
-        <item value="EE0E64652EC30DE70A3753F4B139B782092608739A9FD213A0A9075F13F97DC5:com.olleh.android.oc2"/>
-        <item value="C14BC5BC392DA316E7477D3BB4FB1AC045CDB7FA07874967143633F69373493F:com.kt.ollehfamilybox"/>
-        <item value="01B6241AB640C986B4C1AD572231442C5C313404A8955B28BBEBC92F4FF6901A:com.kt.ollehusimmanager"/>
-        <item value="5129ABC4317E79EC871024D9CA6912B61FB657EC70D3618493CA424678BB7BFE:com.ktcs.whowho"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1891_SK-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1891_SK-Telecom.xml
deleted file mode 100644
index efcd66e1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1891_SK-Telecom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="support_conference_call_bool" value="false"/>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="allow_emergency_video_calls_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="carrier_instant_lettering_length_limit_int" value="16"/>
-    <int name="default_mtu_int" value="1440"/>
-    <string name="carrier_instant_lettering_invalid_chars_string">[\n]</string>
-    <string name="carrier_instant_lettering_escaped_chars_string">"\</string>
-    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
-    <string-array name="bandwidth_string_array" num="19">
-        <item value="GPRS:24,24"/>
-        <item value="EDGE:70,18"/>
-        <item value="UMTS:115,115"/>
-        <item value="CDMA-IS95A:14,14"/>
-        <item value="CDMA-IS95B:14,14"/>
-        <item value="1xRTT:30,30"/>
-        <item value="EvDo-rev.0:750,48"/>
-        <item value="EvDo-rev.A:950,550"/>
-        <item value="HSDPA:4300,620"/>
-        <item value="HSUPA:4300,1800"/>
-        <item value="HSPA:4300,1800"/>
-        <item value="EvDo-rev.B:1500,550"/>
-        <item value="eHRPD:750,48"/>
-        <item value="HSPAP:13000,3400"/>
-        <item value="TD-SCDMA:115,115"/>
-        <item value="LTE:30000,15000"/>
-        <item value="NR_NSA:563200,61440"/>
-        <item value="NR_NSA_MMWAVE:563200,614400"/>
-        <item value="NR_SA:563200,61440"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="59DFFFDDCCC1929A5C089E53B05A27A42F6517B1:com.skt.prod.dialer,com.skt.thug.hazard,kr.co.safet.sk.guardian"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1892_LG-U.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1892_LG-U.xml
deleted file mode 100644
index 2504fbb6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1892_LG-U.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="support_conference_call_bool" value="false"/>
-    <boolean name="editable_enhanced_4g_lte_bool" value="false"/>
-    <boolean name="hide_preferred_network_type_bool" value="true"/>
-    <boolean name="additional_call_setting_bool" value="false"/>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="allow_emergency_video_calls_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="smsToMmsTextLengthThreshold" value="80"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="carrier_instant_lettering_length_limit_int" value="64"/>
-    <int name="default_mtu_int" value="1428"/>
-    <string name="carrier_instant_lettering_invalid_chars_string">["&lt;&gt;\\\n]</string>
-    <string name="carrier_instant_lettering_encoding_string">EUC-KR</string>
-    <string name="carrier_name_string">LG U+</string>
-    <string-array name="bandwidth_string_array" num="19">
-        <item value="GPRS:24,24"/>
-        <item value="EDGE:70,18"/>
-        <item value="UMTS:115,115"/>
-        <item value="CDMA-IS95A:14,14"/>
-        <item value="CDMA-IS95B:14,14"/>
-        <item value="1xRTT:30,30"/>
-        <item value="EvDo-rev.0:750,48"/>
-        <item value="EvDo-rev.A:950,550"/>
-        <item value="HSDPA:4300,620"/>
-        <item value="HSUPA:4300,1800"/>
-        <item value="HSPA:4300,1800"/>
-        <item value="EvDo-rev.B:1500,550"/>
-        <item value="eHRPD:750,48"/>
-        <item value="HSPAP:13000,3400"/>
-        <item value="TD-SCDMA:115,115"/>
-        <item value="LTE:30000,15000"/>
-        <item value="NR_NSA:563200,61440"/>
-        <item value="NR_NSA_MMWAVE:563200,614400"/>
-        <item value="NR_SA:563200,61440"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="15">
-        <item value="2e8478b7b90411ad9075a182725b9a37857440a170fefa8853ee945d0a88170c"/>
-        <item value="6a26b25d1fa974aed6f81ed30a55a72d51e20f6905decbf01e84ecce5fb96454"/>
-        <item value="0f18fddfc990b285798f3bee5710cc5cde9ffd913fd6942f296c4656c7065d8c"/>
-        <item value="0c3eff3693ba9a469fc836c046ebc726ac50c54b36370af8d26cb774b8e88b9f"/>
-        <item value="4986b8386ce4dc1cfd01f5b0541d88caca2695fe24c4d909c8fec2d6a26a2beb"/>
-        <item value="1a8791e1f56e2195b31df30217a2ffe0ef5be2cc6d0058796d2d7f5ce9738cf4"/>
-        <item value="ac3a4e7afeddde9550922ed6e3af343a3fe99a0e5f5a80902354052341ceaef4"/>
-        <item value="606c79a42e1fcb54b1f0abed3602d4aa7b6823ba9909e0df17edce0bcba7b35f"/>
-        <item value="4b0170b8c2924f85c9cebc6230e7eca39d4d8f86cfc443f2f25b93558aabf4df"/>
-        <item value="370259a6a2d8f6cbc838d7375dd2dc6bf05b7a8a5c8d27def9539431b34f43af"/>
-        <item value="4f444ba61644f72a47c99187eab4ebb9f7127ea38eeaacfa0a305511bf55233f"/>
-        <item value="cefc3c7e03e7156bb9fc9e4d31edec96fd461782e7f37cb6e79850bfc1f9c7fb"/>
-        <item value="8f452024920b1e8e0380e293e40426dffe0adfb5e675f4cc6f9266e1c08afa21"/>
-        <item value="212beda6fbf1a07b3557a02c3cf0646263eed855a632f0d45f0bceb311c064c6"/>
-        <item value="34bfb7ae9228d1117d6f594c6812f969ca7aaeb3dbd44be713d1ec2f122d8d01"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1894_SoftBank.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1894_SoftBank.xml
deleted file mode 100644
index 5d57121a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1894_SoftBank.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-    <boolean name="call_barring_supports_password_change_bool" value="false"/>
-    <boolean name="call_barring_supports_deactivate_all_bool" value="false"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="-1"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="307200"/>
-    <int name="maxImageWidth" value="2592"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <int name="ims_dtmf_tone_delay_int" value="215"/>
-    <int name="default_mtu_int" value="1422"/>
-    <string name="default_vm_number_string">1416</string>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="8CD14DE82459630273B8D4C4F0C7C042FA0EF419C2B76A0AAD3D7A0646B015B9:jp.linemo.app,jp.ymobile.app.esim,jp.co.softbank.wispr.froyo"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1895_Freedom-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1895_Freedom-Mobile.xml
deleted file mode 100644
index b4db4bf9..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1895_Freedom-Mobile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="sim_country_iso_override_string">ca</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1896_dtac.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1896_dtac.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1896_dtac.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1897_dtac-.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1897_dtac-.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1897_dtac-.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1898_True-Move.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1898_True-Move.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1898_True-Move.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_18_vodafone-GR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_18_vodafone-GR.xml
deleted file mode 100644
index 98a57054..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_18_vodafone-GR.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="DCFD5757F7AE448C5F79D224D33906880D89D3ABBF887EAC17226DBB52DFD6F6:com.myvodafone.android"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1909_Euskaltel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1909_Euskaltel.xml
deleted file mode 100644
index c4e2af05..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1909_Euskaltel.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <string name="sim_country_iso_override_string">es</string>
-    <string-array name="non_roaming_operator_string_array" num="19">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21407"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1911_Test-Network-Used-by-GSM-test-equipment.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1911_Test-Network-Used-by-GSM-test-equipment.xml
deleted file mode 100644
index c23f4034..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1911_Test-Network-Used-by-GSM-test-equipment.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1912_AT&T-MX.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1912_AT&T-MX.xml
deleted file mode 100644
index a77bd18f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1912_AT&T-MX.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="skip_cf_fail_to_disable_dialog_bool" value="true"/>
-    <string name="sim_country_iso_override_string">mx</string>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="#9"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1913_Telcel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1913_Telcel.xml
deleted file mode 100644
index 76d3926d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1913_Telcel.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="6">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-      <item value="8C960CA3CBF4A9DA851774F2DE072E57B1289A9CF7D6BDA4A6B386A42BC4FFB3:com.trustonic.telecoms.standard.dlc"/>
-      <item value="7413E2B365230E1BCB294D687C3B87EE5BC7E3F9:com.trustonic.telecoms.standard.dlc"/>
-    </string-array>
-    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
-        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
-        <!-- Defines permanent failures. Removed USER_AUTHENTICATION and SERVICE_OPTION_NOT_SUBSCRIBED from default. -->
-        <item value="permanent_fail_causes=8|27|28|30|32|35|50|51|111|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
-        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
-        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
-    </string-array>
-    <boolean name="display_no_data_notification_on_permanent_failure_bool" value="true"/>
-    <boolean name="unthrottle_data_retry_when_tac_changes_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1915_AT&T-MX.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1915_AT&T-MX.xml
deleted file mode 100644
index 68e52a1a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1915_AT&T-MX.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="skip_cf_fail_to_disable_dialog_bool" value="true"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="#9"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1917_eMobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1917_eMobile.xml
deleted file mode 100644
index 2eeb81b3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1917_eMobile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="-1"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="307200"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1925_Claro-PA.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1925_Claro-PA.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1925_Claro-PA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1929_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1929_Movistar.xml
deleted file mode 100644
index 32dfa10d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1929_Movistar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="false"/>
-    <boolean name="enableGroupMms" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1936_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1936_Orange.xml
deleted file mode 100644
index 37aa42aa..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1936_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.otn,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.otn</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1948_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1948_Orange.xml
deleted file mode 100644
index 48cd74a8..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1948_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ogw,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ogw</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1951_Boost-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1951_Boost-Mobile.xml
deleted file mode 100644
index acf4a3a3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1951_Boost-Mobile.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="supportMmsContentDisposition" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="40"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="cdma_3waycall_flash_delay_int" value="300"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="naiSuffix">:pcs</string>
-    <string name="carrier_eri_file_name_string">eri_311870.xml</string>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1952_US-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1952_US-Cellular.xml
deleted file mode 100644
index 17cbd2d0..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1952_US-Cellular.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allowAttachAudio" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="false"/>
-    <boolean name="enabledNotifyWapMMSC" value="true"/>
-    <boolean name="enabledTransID" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="show_cdma_choices_bool" value="true"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="support_wps_over_ims_bool" value="false"/>
-    <boolean name="use_otasp_for_provisioning_bool" value="true"/>
-    <boolean name="volte_5g_limited_alert_dialog_bool" value="true"/>
-    <int name="cdma_3waycall_flash_delay_int" value="300"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <string name="carrier_eri_file_name_string">eri_311220.xml</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-    <string name="sim_country_iso_override_string">us</string>
-    <string name="uaProfTagName">x-wap-profile</string>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="8C960CA3CBF4A9DA851774F2DE072E57B1289A9CF7D6BDA4A6B386A42BC4FFB3:com.trustonic.telecoms.standard.dlc,com.trustonic.telecoms.client.standard.dlc.playground,com.trustonic.telecoms.standard.dpc"/>
-        <item value="7413E2B365230E1BCB294D687C3B87EE5BC7E3F9:com.trustonic.telecoms.standard.dlc,com.trustonic.telecoms.client.standard.dlc.playground,com.trustonic.telecoms.standard.dpc"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1953_Claro-CR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1953_Claro-CR.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1953_Claro-CR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1954_Claro-SV.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1954_Claro-SV.xml
deleted file mode 100644
index ebe580f3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1954_Claro-SV.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1955_Claro-PR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1955_Claro-PR.xml
deleted file mode 100644
index 98e0171f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1955_Claro-PR.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-6" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableGroupMms" value="false"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1958_Free.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1958_Free.xml
deleted file mode 100644
index c1d3ab9e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1958_Free.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="20801"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="3">
-      <item value="d543e9f245aa584a84c608069cffe1f507be61eb496d7585ac02a2fce05dcb28:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
-      <item value="a1fe35ab00f6301fdafda1309b8faac2895bf5d46ef5d9ae6895c5a5ad84eeb7:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
-      <item value="176461745f20b294b43960e9357bd6daffc87def7ddd75b9596e74076e5b19b0:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,fr.free.moncomptefree"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1961_Airtel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1961_Airtel.xml
deleted file mode 100644
index 727063ec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1961_Airtel.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">airtel</string>
-    <int name="httpSocketTimeout" value="300000"/>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="7170F9C35AC5966C1687372089AF55713DACC17635BAD248370DA67DDF8472B6:com.myairtelapp"/>
-        <item value="FB9FD5425AB63FA933CF8125B2F3EFC0DF11F0DE0C9C01EF2F2B71A3EBD135A3:com.airtelx.airtelkiosk"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1962_Fido.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1962_Fido.xml
deleted file mode 100644
index 9021fb4c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1962_Fido.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="default_mtu_int" value="1410"/>
-    <string name="carrier_name_string">Fido</string>
-    <string name="gps.lpp_profile">2</string>
-    <string-array name="read_only_apn_types_string_array" num="1">
-        <item value="*"/>
-    </string-array>
-    <string-array name="non_roaming_operator_string_array" num="5">
-        <item value="302220"/>
-        <item value="302610"/>
-        <item value="302660"/>
-        <item value="302720"/>
-        <item value="302780"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1963_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1963_Vodafone.xml
deleted file mode 100644
index 46cc3d38..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1963_Vodafone.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="default_mtu_int" value="1358"/>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1964_Aio.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1964_Aio.xml
deleted file mode 100644
index 984f2a03..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1964_Aio.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_hold_call_during_emergency_bool" value="false"/>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="csp_enabled_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string">cricket</string>
-    <string-array name="roaming_operator_string_array" num="5">
-        <item value="310110"/>
-        <item value="310140"/>
-        <item value="310400"/>
-        <item value="310470"/>
-        <item value="311170"/>
-    </string-array>
-    <string-array name="non_roaming_operator_string_array" num="7">
-        <item value="310"/>
-        <item value="311"/>
-        <item value="312"/>
-        <item value="313"/>
-        <item value="314"/>
-        <item value="315"/>
-        <item value="316"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1969_Asia-Cell.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1969_Asia-Cell.xml
deleted file mode 100644
index 47f32d1f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1969_Asia-Cell.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="102400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1971_Zain-Iraq.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1971_Zain-Iraq.xml
deleted file mode 100644
index c56eb668..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1971_Zain-Iraq.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="153600"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1972_Zain-Saudi-Arabia.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1972_Zain-Saudi-Arabia.xml
deleted file mode 100644
index 1ce789c2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1972_Zain-Saudi-Arabia.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="409600"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1974_Jazztel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1974_Jazztel.xml
deleted file mode 100644
index fd645b03..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1974_Jazztel.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="carrier_use_ims_first_for_emergency_bool" value="false"/>
-    <string-array name="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1976_ONO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1976_ONO.xml
deleted file mode 100644
index 6b7371fe..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1976_ONO.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1982_TATA-DOCOMO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1982_TATA-DOCOMO.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1982_TATA-DOCOMO.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1985_Inwi.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1985_Inwi.xml
deleted file mode 100644
index 47f32d1f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1985_Inwi.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="102400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1988_O2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1988_O2.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1988_O2.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1989_Google-Fi.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1989_Google-Fi.xml
deleted file mode 100644
index 86b0d4cb..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1989_Google-Fi.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="force_home_network_bool" value="true"/>
-    <string name="carrier_name_string">Google Fi</string>
-    <string name="sim_country_iso_override_string">us</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1990_Golan-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1990_Golan-Telecom.xml
deleted file mode 100644
index 01de36f5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1990_Golan-Telecom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">Golan Telecom</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="42502"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1991_Hot-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1991_Hot-Mobile.xml
deleted file mode 100644
index 9c19b4e4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1991_Hot-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">HOT mobile</string>
-    <string name="sim_country_iso_override_string">il</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="42503"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1997_TrueMove-H-4G-LTE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1997_TrueMove-H-4G-LTE.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1997_TrueMove-H-4G-LTE.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_19_Vodafone-IE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_19_Vodafone-IE.xml
deleted file mode 100644
index 0ae4b5b1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_19_Vodafone-IE.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="DD839AD437E56CDCE41B683F35777EA73DD2B5571FE6849B26176FC26F03CC40:com.VodafoneIreland.MyVodafone"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1_T-Mobile-US.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1_T-Mobile-US.xml
deleted file mode 100644
index f871ffa6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_1_T-Mobile-US.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="carrier_default_wfc_ims_mode_int" value="1" />
-    <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="carrier_ims_gba_required_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_tty_supported_bool" value="false"/>
-    <boolean name="carrier_vowifi_tty_supported_bool" value="false"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="carrier_wfc_supports_wifi_only_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="hide_tty_hco_vco_with_rtt" value="true"/>
-    <boolean name="wfc_carrier_name_override_by_pnn_bool" value="true"/>
-    <boolean name="ims.enable_presence_capability_exchange_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <int name="vvm_port_number_int" value="1808"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <int name="gba_ua_security_organization_int" value="1"/> <!-- ORG_3GPP -->
-    <int name="gba_ua_security_protocol_int" value="65536"/> <!-- UA_SECURITY_PROTOCOL_3GPP_TLS_DEFAULT -->
-    <int name="gba_ua_tls_cipher_suite_int" value="47"/> <!-- TLS_RSA_WITH_AES_128_CBC_SHA -->
-    <int name="default_mtu_int" value="1440"/>
-    <string name="carrier_name_string">T-Mobile</string>
-    <string name="carrier_vvm_package_name_string">com.tmobile.vvm.application</string>
-    <string name="vvm_destination_number_string">122</string>
-    <string name="vvm_type_string">vvm_type_cvvm</string>
-    <string name="call_composer_picture_server_url_string">https://ue.fcs.mstore.msg.t-mobile.com/restclient/V1/FCS/Upload</string>
-    <string-array name="wfc_operator_error_codes_string_array" num="1">
-        <item value="REG09|0"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="4">
-        <item value="92B5F8117FBD9BD5738FF168A4FA12CBE284BE834EDE1A7BB44DD8455BA15920:com.tmobile.rsuapp,com.tmobile.echolocate,com.tmobile.services.nameid,com.tmobile.pr.mytmobile,com.tmobile.vvm.application"/>
-        <item value="3D1A4BEF6EE7AF7D34D120E7B1AAC0DD245585DE6237CF100F68333AFACFF562:com.tmobile.rsuapp,com.tmobile.echolocate,com.tmobile.services.nameid,com.tmobile.pr.mytmobile,com.tmobile.vvm.application"/>
-        <item value="6892793FC413019D2DF609DFED7AF622D0F2D8FCF96EFA7E3FB87EEA34E10B93:com.tmobile.rsuapp,com.tmobile.echolocate,com.tmobile.services.nameid,com.tmobile.pr.mytmobile,com.tmobile.vvm.application"/>
-        <item value="7B68FD9D4E7610C9CB35FC0C6CC06EA04C6906E3DFA9F48F9A05460AF36BFFFC:com.tmobile.rsuapp,com.tmobile.echolocate,com.tmobile.services.nameid,com.tmobile.pr.mytmobile,com.tmobile.vvm.application"/>
-    </string-array>
-    <boolean name="ratchet_nr_advanced_bandwidth_if_rrc_idle_bool" value="true"/>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,30;connected,legacy,30;not_restricted_rrc_idle,legacy,30;not_restricted_rrc_con,legacy,30</string>
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="41"/>
-    </int-array>
-    <boolean name="enable_nr_advanced_for_roaming_bool" value="false"/>
-    <boolean name="show_roaming_indicator_bool" value="false"/>
-    <string-array name="data_connected_roaming_notification_excluded_mccs_string_array" num="7">
-        <item value="310"/>
-        <item value="311"/>
-        <item value="312"/>
-        <item value="313"/>
-        <item value="314"/>
-        <item value="315"/>
-        <item value="316"/>
-    </string-array>
-    <string-array name="data_connected_roaming_notification_included_mcc_mncs_string_array" num="11">
-        <item value="310032"/>
-        <item value="310033"/>
-        <item value="310110"/>
-        <item value="310140"/>
-        <item value="310370"/>
-        <item value="310400"/>
-        <item value="310470"/>
-        <item value="310500"/>
-        <item value="310970"/>
-        <item value="311170"/>
-        <item value="311250"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2002_Uninor.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2002_Uninor.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2002_Uninor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2005_NRJ-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2005_NRJ-Mobile.xml
deleted file mode 100644
index 58d44914..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2005_NRJ-Mobile.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="non_roaming_operator_string_array" num="2">
-        <item value="20801"/>
-        <item value="20810"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2008_Videotron.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2008_Videotron.xml
deleted file mode 100644
index c420a7e5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2008_Videotron.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="3072000"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="302"/>
-    </string-array>
-    <int name="lte_plus_threshold_bandwidth_khz_int" value="0"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2011_Inland-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2011_Inland-Cellular.xml
deleted file mode 100644
index 7d4a728d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2011_Inland-Cellular.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_tty_supported_bool" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="carrier_ims_gba_required_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1228800"/>
-    <int name="maxImageWidth" value="4320"/>
-    <int name="default_mtu_int" value="1440"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-    <string name="carrier_name_string">T-Mobile</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2018_Reliance-Jio.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2018_Reliance-Jio.xml
deleted file mode 100644
index 88f54659..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2018_Reliance-Jio.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="hide_ims_apn_bool" value="true"/>
-    <int name="httpSocketTimeout" value="300000"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <string name="carrier_name_string">JIO</string>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-    <string-array name="allowed_initial_attach_apn_types_string_array" num="2">
-        <item value="ia"/>
-        <item value="default"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="2">
-        <item value="e7d0c66ff87eae18e4cd16b592ad074e5239809af849f2c9a1ac15f9a026784a:com.jio.mobilock"/>
-        <item value="fbbd7cc8e99bf58cdc03d6fc006b9dabfb5d2b7aea00b69dbcbc783a15aa455b:com.jio.myjio"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2020_Koodo-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2020_Koodo-Mobile.xml
deleted file mode 100644
index 48d89180..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2020_Koodo-Mobile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="78"/>
-    </int-array>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
-    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
-    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2021_Virgin-Mobile-Canada.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2021_Virgin-Mobile-Canada.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2021_Virgin-Mobile-Canada.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2022_TracFone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2022_TracFone.xml
deleted file mode 100644
index 7f9dd7df..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2022_TracFone.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2023_Consumer-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2023_Consumer-Cellular.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2023_Consumer-Cellular.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2024_Locus-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2024_Locus-Telecom.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2024_Locus-Telecom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePure-Talk.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePure-Talk.xml
deleted file mode 100644
index 26179db2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePure-Talk.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePureTalk.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePureTalk.xml
deleted file mode 100644
index 479ec33e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2025_TelritePureTalk.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2026_Red-Pocket.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2026_Red-Pocket.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2026_Red-Pocket.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2027_Airvoice.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2027_Airvoice.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2027_Airvoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2028_Ztar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2028_Ztar.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2028_Ztar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2029_Defense-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2029_Defense-Mobile.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2029_Defense-Mobile.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2030_AGMS.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2030_AGMS.xml
deleted file mode 100644
index 26179db2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2030_AGMS.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2031_Kore.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2031_Kore.xml
deleted file mode 100644
index dc77362a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2031_Kore.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_XFINIY-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_XFINIY-Mobile.xml
deleted file mode 100644
index 297b208b..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_XFINIY-Mobile.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="aliasEnabled" value="true"/>
-    <boolean name="allowAttachAudio" value="false"/>
-    <boolean name="allow_add_call_during_video_call" value="false"/>
-    <boolean name="allow_adding_apns_bool" value="false"/>
-    <boolean name="allow_hold_in_ims_call" value="false"/>
-    <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false"/>
-    <boolean name="apn_expand_bool" value="false"/>
-    <boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
-    <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_provisioned_bool" value="true"/>
-    <boolean name="carrier_volte_provisioning_required_bool" value="true"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="cdma_home_registered_plmn_name_override_bool" value="true"/>
-    <boolean name="disable_voice_barring_notification_bool" value="true"/>
-    <boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="editable_wfc_mode_bool" value="false"/>
-    <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enabledNotifyWapMMSC" value="true"/>
-    <boolean name="enabledTransID" value="true"/>
-    <boolean name="gps.persist_lpp_mode_bool" value="true"/>
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
-    <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
-    <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
-    <boolean name="operator_selection_expand_bool" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
-    <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
-    <boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
-    <boolean name="support_pause_ims_video_calls_bool" value="true"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
-    <boolean name="ims.enable_presence_publish_bool" value="true"/>
-    <boolean name="video_calls_can_be_hd_audio" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
-    <boolean name="world_mode_enabled_bool" value="true"/>
-    <int name="aliasMaxChars" value="48"/>
-    <int name="aliasMinChars" value="2"/>
-    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
-    <int name="lte_earfcns_rsrp_boost_int" value="6"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1258291"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="7"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_eri_file_name_string">eri_311480_BA01450000000000.xml</string>
-    <string name="carrier_name_string">Verizon</string>
-    <string name="cdma_home_registered_plmn_name_string">XFINITY Mobile</string>
-    <string name="default_vm_number_string">*86</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-    <string name="sim_country_iso_override_string">us</string>
-    <string name="uaProfTagName">Profile</string>
-    <string-array name="boosted_lte_earfcns_string_array" num="2">
-        <item value="600-1199"/>
-        <item value="1950-2399"/>
-    </string-array>
-    <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
-        <item value="*71"/>
-        <item value="*72"/>
-    </string-array>
-    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
-        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
-        <!-- Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default. -->
-        <item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
-        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
-        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
-    </string-array>
-    <string-array name="carrier_metered_apn_types_strings" num="3">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="mms"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="dial_string_replace_string_array" num="2">
-        <item value="*611:+19085594899"/>
-        <item value="*86:+1MDN"/>
-    </string-array>
-    <string-array name="filtered_cnap_names_string_array" num="2">
-        <item value="WIRELESS CALLER"/>
-        <item value="UNKNOWN NAME"/>
-    </string-array>
-    <string-array name="ims_reasoninfo_mapping_string_array" num="10">
-        <item value="332|simultaneous call limit has already been reached|1403"/>
-        <item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403"/>
-        <item value="338|another device sent all devices busy response|1404"/>
-        <item value="501|call completion elsewhere|1014"/>
-        <item value="501|call has been pulled by another device|1016"/>
-        <item value="510|call has been pulled by another device|1016"/>
-        <item value="501|another device sent all devices busy response|1404"/>
-        <item value="510|another device sent all devices busy response|1404"/>
-        <item value="1014|call has been pulled by another device|1016"/>
-        <item value="*|Call is dropped due to Wi-Fi signal is degraded|1407"/>
-    </string-array>
-    <string-array name="read_only_apn_fields_string_array" num="20">
-        <item value="name"/>
-        <item value="proxy"/>
-        <item value="port"/>
-        <item value="user"/>
-        <item value="password"/>
-        <item value="server"/>
-        <item value="mmsc"/>
-        <item value="mmsproxy"/>
-        <item value="mmsport"/>
-        <item value="mcc"/>
-        <item value="mnc"/>
-        <item value="authtype"/>
-        <item value="type"/>
-        <item value="protocol"/>
-        <item value="roaming_protocol"/>
-        <item value="bearer"/>
-        <item value="bearer_bitmask"/>
-        <item value="carrier_enabled"/>
-        <item value="mvno_type"/>
-        <item value="mvno_match_data"/>
-    </string-array>
-    <int-array name="lte_rsrp_thresholds_int_array" num="4">
-        <item value="-115"/>
-        <item value="-105"/>
-        <item value="-95"/>
-        <item value="-85"/>
-    </int-array>
-    <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
-        <item value="64"/>
-        <item value="65"/>
-        <item value="66"/>
-        <item value="76"/>
-        <item value="77"/>
-        <item value="78"/>
-        <item value="79"/>
-        <item value="80"/>
-        <item value="81"/>
-        <item value="82"/>
-        <item value="83"/>
-    </int-array>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="953F5A4C22E7FD16ADC3F12EB038682AAD377FEF9A18B9D12C1ABEA78911C749:com.xfinity.digitalhome"/>
-        <item value="06AADA946110E64414AEBE3AF34AE06BAF239EF75C947149FB67263D8A2547C3:com.xfinity.digitalhome.debug"/>
-        <item value="141E264EB08B576F6C32E49FD47A34300553A132EC5EB1DD58B354A0B15A5E40:com.xfinitymobile.cometcarrierservice"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_Xfinity-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_Xfinity-Mobile.xml
deleted file mode 100644
index 75aec4d5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2032_Xfinity-Mobile.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="aliasEnabled" value="true"/>
-    <boolean name="allowAttachAudio" value="false"/>
-    <boolean name="allow_add_call_during_video_call" value="false"/>
-    <boolean name="allow_adding_apns_bool" value="false"/>
-    <boolean name="allow_hold_in_ims_call" value="false"/>
-    <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false"/>
-    <boolean name="apn_expand_bool" value="false"/>
-    <boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
-    <boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_volte_provisioned_bool" value="true"/>
-    <boolean name="carrier_volte_provisioning_required_bool" value="true"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="true"/>
-    <boolean name="cdma_home_registered_plmn_name_override_bool" value="true"/>
-    <boolean name="disable_voice_barring_notification_bool" value="true"/>
-    <boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
-    <boolean name="dtmf_type_enabled_bool" value="true"/>
-    <boolean name="editable_wfc_mode_bool" value="false"/>
-    <boolean name="editable_wfc_roaming_mode_bool" value="true"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="enabledNotifyWapMMSC" value="true"/>
-    <boolean name="enabledTransID" value="true"/>
-    <boolean name="gps.persist_lpp_mode_bool" value="true"/>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-    <boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
-    <boolean name="mmsCloseConnection" value="true"/>
-    <boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
-    <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
-    <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
-    <boolean name="operator_selection_expand_bool" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="rtt_supported_bool" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
-    <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
-    <boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
-    <boolean name="support_pause_ims_video_calls_bool" value="true"/>
-    <boolean name="support_swap_after_merge_bool" value="false"/>
-    <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
-    <boolean name="ims.enable_presence_publish_bool" value="true"/>
-    <boolean name="video_calls_can_be_hd_audio" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
-    <boolean name="world_mode_enabled_bool" value="true"/>
-    <int name="aliasMaxChars" value="48"/>
-    <int name="aliasMinChars" value="2"/>
-    <int name="carrier_default_wfc_ims_mode_int" value="1"/>
-    <int name="ims_conference_size_limit_int" value="5"/>
-    <int name="lte_earfcns_rsrp_boost_int" value="6"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="1258291"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="7"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_eri_file_name_string">eri_311480_BA01450000000000.xml</string>
-    <string name="carrier_name_string">Verizon</string>
-    <string name="cdma_home_registered_plmn_name_string">XFINITY Mobile</string>
-    <string name="default_vm_number_string">*86</string>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-    <string name="sim_country_iso_override_string">us</string>
-    <string name="uaProfTagName">Profile</string>
-    <string-array name="boosted_lte_earfcns_string_array" num="2">
-        <item value="600-1199"/>
-        <item value="1950-2399"/>
-    </string-array>
-    <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
-        <item value="*71"/>
-        <item value="*72"/>
-    </string-array>
-    <string-array name="telephony_data_setup_retry_rules_string_array" num="4">
-        <item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
-        <!-- Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default. -->
-        <item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
-        <item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
-        <item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
-    </string-array>
-    <string-array name="carrier_metered_apn_types_strings" num="3">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
-        <item value="default"/>
-        <item value="dun"/>
-        <item value="mms"/>
-        <item value="supl"/>
-    </string-array>
-    <string-array name="dial_string_replace_string_array" num="2">
-        <item value="*611:+19085594899"/>
-        <item value="*86:+1MDN"/>
-    </string-array>
-    <string-array name="filtered_cnap_names_string_array" num="2">
-        <item value="WIRELESS CALLER"/>
-        <item value="UNKNOWN NAME"/>
-    </string-array>
-    <string-array name="ims_reasoninfo_mapping_string_array" num="10">
-        <item value="332|simultaneous call limit has already been reached|1403"/>
-        <item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403"/>
-        <item value="338|another device sent all devices busy response|1404"/>
-        <item value="501|call completion elsewhere|1014"/>
-        <item value="501|call has been pulled by another device|1016"/>
-        <item value="510|call has been pulled by another device|1016"/>
-        <item value="501|another device sent all devices busy response|1404"/>
-        <item value="510|another device sent all devices busy response|1404"/>
-        <item value="1014|call has been pulled by another device|1016"/>
-        <item value="*|Call is dropped due to Wi-Fi signal is degraded|1407"/>
-    </string-array>
-    <string-array name="read_only_apn_fields_string_array" num="20">
-        <item value="name"/>
-        <item value="proxy"/>
-        <item value="port"/>
-        <item value="user"/>
-        <item value="password"/>
-        <item value="server"/>
-        <item value="mmsc"/>
-        <item value="mmsproxy"/>
-        <item value="mmsport"/>
-        <item value="mcc"/>
-        <item value="mnc"/>
-        <item value="authtype"/>
-        <item value="type"/>
-        <item value="protocol"/>
-        <item value="roaming_protocol"/>
-        <item value="bearer"/>
-        <item value="bearer_bitmask"/>
-        <item value="carrier_enabled"/>
-        <item value="mvno_type"/>
-        <item value="mvno_match_data"/>
-    </string-array>
-    <int-array name="lte_rsrp_thresholds_int_array" num="4">
-        <item value="-115"/>
-        <item value="-105"/>
-        <item value="-95"/>
-        <item value="-85"/>
-    </int-array>
-    <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
-        <item value="64"/>
-        <item value="65"/>
-        <item value="66"/>
-        <item value="76"/>
-        <item value="77"/>
-        <item value="78"/>
-        <item value="79"/>
-        <item value="80"/>
-        <item value="81"/>
-        <item value="82"/>
-        <item value="83"/>
-    </int-array>    
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="953F5A4C22E7FD16ADC3F12EB038682AAD377FEF9A18B9D12C1ABEA78911C749:com.xfinity.digitalhome"/>
-        <item value="06AADA946110E64414AEBE3AF34AE06BAF239EF75C947149FB67263D8A2547C3:com.xfinity.digitalhome.debug"/>
-        <item value="141E264EB08B576F6C32E49FD47A34300553A132EC5EB1DD58B354A0B15A5E40:com.xfinitymobile.cometcarrierservice"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2034_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2034_Orange.xml
deleted file mode 100644
index 0e8113bc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2034_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.oml,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.oml</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2035_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2035_Orange.xml
deleted file mode 100644
index c3e6d4c0..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2035_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.olr,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.olr</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2036_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2036_Orange.xml
deleted file mode 100644
index 6bed6175..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2036_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ocd,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ocd</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2043_UPC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2043_UPC.xml
deleted file mode 100644
index a1185fcc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2043_UPC.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="23203"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2055_Chatr-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2055_Chatr-Mobile.xml
deleted file mode 100644
index c8f25e78..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2055_Chatr-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2063_Family-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2063_Family-Mobile.xml
deleted file mode 100644
index 886bb5cf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2063_Family-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2064_GoSmart.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2064_GoSmart.xml
deleted file mode 100644
index 886bb5cf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2064_GoSmart.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2078_Simple-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2078_Simple-Mobile.xml
deleted file mode 100644
index 886bb5cf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2078_Simple-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_data_roaming_enabled_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="E751E163E91E041382839556D31302DB7058C44D9DF1B5B27FC43BD8F0EE2BBA:com.tracfone.preload.accountservices,com.tracfone.preload.mobileservices"/>
-        <item value="4AD124DE517BC6BA915B88C17F0AADF764469842156325C26B7CD8B888C41C71:com.tracfone.esimapp"/>
-        <item value="55BB3B316919620008AA76A4891E90384BFF2A76AE95C395FE738C2AC609F13F:com.tracfone.tracfone.myaccount,com.tracfone.straighttalk.myaccount,com.tracfone.net10.myaccount,com.tracfone.simplemobile.myaccount,com.tracfone.total.myaccount,com.tracfone.wfm.myaccount"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2088_Crnogorski-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2088_Crnogorski-Telekom.xml
deleted file mode 100644
index 119720f9..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2088_Crnogorski-Telekom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2089_Public-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2089_Public-Mobile.xml
deleted file mode 100644
index dc119e9a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2089_Public-Mobile.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  ~ Copyright (C) 2023 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,connected,30;connected_mmwave,not_restricted_rrc_idle,30;connected_mmwave,not_restricted_rrc_con,30</string>
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="78"/>
-    </int-array>
-    <int name="nr_advanced_threshold_bandwidth_khz_int" value="60000"/>
-    <boolean name="enable_nr_advanced_for_roaming_bool" value="true"/>
-    <boolean name="include_lte_for_nr_advanced_threshold_bandwidth_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2091_Bonbon.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2091_Bonbon.xml
deleted file mode 100644
index 38bdbe01..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2091_Bonbon.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-    <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2092_congstar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2092_congstar.xml
deleted file mode 100644
index 0b3d1d6a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2092_congstar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <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"/>
-        <item value="A3EFD06CA935A1D530F58F4472BC0FBA0611C7CEE21111FDEDFEAFB477B36F83:de.congstar.meincongstar"/>
-        <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2093_Tesco.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2093_Tesco.xml
deleted file mode 100644
index 7be753d7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2093_Tesco.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string">905</string>
-    <string-array name="non_roaming_operator_string_array" num="8">
-        <item value="23420"/>
-        <item value="23426"/>
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-    <int-array name="radio_restart_failure_causes_int_array" num="1">
-        <item value="55"/>
-    </int-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2094_tele-ring.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2094_tele-ring.xml
deleted file mode 100644
index 1fc3d1b5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2094_tele-ring.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="E19DB5D5DDB900229C81DEF1C8C86DD2457AFDEED7676C89DF6EF11D5EEA5E6D:at.tmobile.android.myt"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2095_Ben.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2095_Ben.xml
deleted file mode 100644
index fa199ccf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2095_Ben.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="66D1423581F5C3FC7AE91C53DCEFA2AD7DEF0265FE261ED4FB7423E0F57C0AFE:nl.oberon.tmobile.my"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_20_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_20_Vodafone.xml
deleted file mode 100644
index 252fe2ec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_20_Vodafone.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="default_mtu_int" value="1358"/>
-    <string name="default_vm_number_string">+31654501233</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2101_BT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2101_BT.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2101_BT.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2103_BT-One-Phone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2103_BT-One-Phone.xml
deleted file mode 100644
index 49d0d75c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2103_BT-One-Phone.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <string-array name="non_roaming_operator_string_array" num="2">
-        <item value="23430"/>
-        <item value="23433"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2106_IIJmio.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2106_IIJmio.xml
deleted file mode 100644
index 0af909b1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2106_IIJmio.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">jp</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2109_Rakuten-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2109_Rakuten-Mobile.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2109_Rakuten-Mobile.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2110_UQ-mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2110_UQ-mobile.xml
deleted file mode 100644
index 1bc868c6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2110_UQ-mobile.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="disable_dun_apn_while_roaming_with_preset_apn_bool" value="true"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">UQ mobile</string>
-    <string-array name="carrier_certificate_string_array" num="4">
-        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
-        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
-        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
-        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2112_Telecable.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2112_Telecable.xml
deleted file mode 100644
index 01dfa1fe..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2112_Telecable.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2113_mobilR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2113_mobilR.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2113_mobilR.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2118_giffgaff.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2118_giffgaff.xml
deleted file mode 100644
index ec5e6347..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2118_giffgaff.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="10"/>
-    <string name="default_vm_number_string">443</string>
-    <string-array name="non_roaming_operator_string_array" num="8">
-        <item value="23420"/>
-        <item value="23426"/>
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-    <int-array name="radio_restart_failure_causes_int_array" num="1">
-        <item value="55"/>
-    </int-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2119_FirstNet.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2119_FirstNet.xml
deleted file mode 100644
index 014ccdbc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2119_FirstNet.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_hold_call_during_emergency_bool" value="false"/>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="limited_sim_function_notification_for_dsds_bool" value="true"/>
-    <boolean name="show_4g_for_3g_data_icon_bool" value="true"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="22">
-        <item value="0"/>
-        <item value="00"/>
-        <item value="*0"/>
-        <item value="*1"/>
-        <item value="*2"/>
-        <item value="*3"/>
-        <item value="*4"/>
-        <item value="*5"/>
-        <item value="*6"/>
-        <item value="*7"/>
-        <item value="*8"/>
-        <item value="*9"/>
-        <item value="#0"/>
-        <item value="#1"/>
-        <item value="#2"/>
-        <item value="#3"/>
-        <item value="#4"/>
-        <item value="#5"/>
-        <item value="#6"/>
-        <item value="#7"/>
-        <item value="#8"/>
-        <item value="#9"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2124_Iliad.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2124_Iliad.xml
deleted file mode 100644
index 7afd863d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2124_Iliad.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">it</string>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="8227db5476f1d42a17bead90b73c8624b262152edad34ebd8f7e6472a47c6e03:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,it.iliad.android.mobileconf,it.iliad.android.iccid"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2125_Simyo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2125_Simyo.xml
deleted file mode 100644
index 583268b3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2125_Simyo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2126_Spectrum-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2126_Spectrum-Mobile.xml
deleted file mode 100644
index b4c8ff50..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2126_Spectrum-Mobile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="319B78A5F33B8876ED80F0D6A69D163B35598A70E4C6B7044667DBF8E0FF3B00:com.TWCableTV"/>
-        <item value="2FBD0E00759E4293AE10DBB1AF83250455EB532F296D090705A5EAE79009E48D:com.brighthouse.mybhn"/>
-        <item value="B09473061A2A8A197B97A3B3EFEE52E1919BA548CC26B785FB7E5F769A7333F0:com.spectrum.cm.headless"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2127_free_re.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2127_free_re.xml
deleted file mode 100644
index 8021a442..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2127_free_re.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">re</string>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="d543e9f245aa584a84c608069cffe1f507be61eb496d7585ac02a2fce05dcb28:fr.freemobile.android.mobileconf,fr.freemobile.android.freenetworkmonitor,it.iliad.android.mobileconf,it.iliad.android.iccid"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2128_Sprint-Wholesale.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2128_Sprint-Wholesale.xml
deleted file mode 100644
index 592215ff..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2128_Sprint-Wholesale.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2130_ALIV_BS.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2130_ALIV_BS.xml
deleted file mode 100644
index c839508a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2130_ALIV_BS.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">bs</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2131_Altecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2131_Altecom.xml
deleted file mode 100644
index 1374cc1d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2131_Altecom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="non_roaming_operator_string_array" num="21">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2135_Coriolis.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2135_Coriolis.xml
deleted file mode 100644
index 88d2aad9..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2135_Coriolis.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="vvm_port_number_int" value="5499"/>
-    <string name="vvm_destination_number_string">223</string>
-    <string name="vvm_type_string">vvm_type_omtp</string>
-    <string-array name="carrier_vvm_package_name_string_array" num="1">
-        <item value="com.coriolis.visualvoicemailcoriolis"/>
-    </string-array>
-    <string name="sim_country_iso_override_string">fr</string>
-    <string-array name="non_roaming_operator_string_array" num="2">
-        <item value="20801"/>
-        <item value="20810"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2137_Gamma.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2137_Gamma.xml
deleted file mode 100644
index 2a6fc6ba..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2137_Gamma.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">gb</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2138_jump.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2138_jump.xml
deleted file mode 100644
index 2a6fc6ba..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2138_jump.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">gb</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2139_sky.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2139_sky.xml
deleted file mode 100644
index 2a6fc6ba..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2139_sky.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="sim_country_iso_override_string">gb</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2146_Visible.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2146_Visible.xml
deleted file mode 100644
index 62e4e139..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2146_Visible.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="D8EFE020E48AEC0A21E67EFC8FAFC2E674A05C74970381D99175E23C084B7BF0:com.visiblemobile.flagship"/>
-    </string-array>
-    <string name="emailGatewayNumber">6245</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2150_Telenet.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2150_Telenet.xml
deleted file mode 100644
index 6ee0d2be..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2150_Telenet.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="non_roaming_operator_string_array" num="1">
-        <item value="20610"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2152_Lycamobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2152_Lycamobile.xml
deleted file mode 100644
index c5ed21a4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2152_Lycamobile.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="non_roaming_operator_string_array" num="8">
-        <item value="23410"/>
-        <item value="23420"/>
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2153_Unité.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2153_Unité.xml
deleted file mode 100644
index 9ae5750f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2153_Unité.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int-array name="only_single_dc_allowed_int_array" num="8">
-        <item value="1"/>
-        <item value="2"/>
-        <item value="3"/>
-        <item value="9"/>
-        <item value="10"/>
-        <item value="11"/>
-        <item value="14"/>
-        <item value="15"/>
-    </int-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2155_Nova.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2155_Nova.xml
deleted file mode 100644
index 245a6aa6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2155_Nova.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
-    <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    <int name="carrier_default_wfc_ims_mode_int" value="2"/>
-    <boolean name="show_wifi_calling_icon_in_status_bar_bool" value="true" />
-    <boolean name="show_ims_registration_status_bool" value="true" />
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="carrier_vt_available_bool" value="true"/>
-</carrier_config>
-
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml
deleted file mode 100644
index f2b767d2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2169_Alon-Cellular-Ltd.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">YouPhone</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2170_Home-Cellular.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2170_Home-Cellular.xml
deleted file mode 100644
index c320f848..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2170_Home-Cellular.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">Home Cellular</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2171_Rami-Levy.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2171_Rami-Levy.xml
deleted file mode 100644
index 62b41781..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2171_Rami-Levy.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">Rami Levy</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2216_VTR-Banda-Ancha-SA.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2216_VTR-Banda-Ancha-SA.xml
deleted file mode 100644
index 2cfd9e01..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2216_VTR-Banda-Ancha-SA.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="73002"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2237_China-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2237_China-Telecom.xml
deleted file mode 100644
index f3989579..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2237_China-Telecom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <string name="sim_country_iso_override_string">cn</string>
-    <boolean name="ascii_7_bit_support_for_long_message_bool" value="true"/>
-    <string-array name="telephony_network_capability_priorities_string_array" num="11">
-        <item value="eims:90"/>
-        <item value="supl:80"/>
-        <item value="mms:70"/>
-        <item value="xcap:60"/>
-        <item value="cbs:50"/>
-        <item value="mcx:50"/>
-        <item value="fota:50"/>
-        <item value="ims:40"/>
-        <item value="dun:30"/>
-        <item value="enterprise:20"/>
-        <item value="internet:20"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2250_ArgentinaNuestro.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2250_ArgentinaNuestro.xml
deleted file mode 100644
index 8cca4675..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2250_ArgentinaNuestro.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="72234"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2252_EastLink.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2252_EastLink.xml
deleted file mode 100644
index a63cd28c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2252_EastLink.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2253_ALU-Test-SIM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2253_ALU-Test-SIM.xml
deleted file mode 100644
index 27da205c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2253_ALU-Test-SIM.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_apn_setting_cdma_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="6"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2255_NexTech-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2255_NexTech-Wireless.xml
deleted file mode 100644
index 1fb33c6a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2255_NexTech-Wireless.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enableSMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSDeliveryReports" value="false"/>
-    <boolean name="enableMMSReadReports" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="false"/>
-    <int name="smsToMmsTextThreshold" value="-1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="10"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-    <string name="emailGatewayNumber">6245</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2263_Claro-JM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2263_Claro-JM.xml
deleted file mode 100644
index e8fde2f2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2263_Claro-JM.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2264_Videocon.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2264_Videocon.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2264_Videocon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2265_STEL.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2265_STEL.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2265_STEL.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2266_Cheers.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2266_Cheers.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2266_Cheers.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2288_GSC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2288_GSC.xml
deleted file mode 100644
index 2745db47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2288_GSC.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <int name="smsToMmsTextThreshold" value="1"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="2432"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="4320"/>
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_22_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_22_Vodafone.xml
deleted file mode 100644
index 688b3384..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_22_Vodafone.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="1EE6A3F2CBCADB2060075A9147F5336B8B9D68E0979FD097A65CD7DD70852389:com.vodafone.mCare"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2310_Debitel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2310_Debitel.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2310_Debitel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2363_Crnogorski-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2363_Crnogorski-Telekom.xml
deleted file mode 100644
index 39389449..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2363_Crnogorski-Telekom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="5">
-        <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"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2365_Hrvatski-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2365_Hrvatski-Telekom.xml
deleted file mode 100644
index 76e398d1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2365_Hrvatski-Telekom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="CC12A9016142DD2080D20F8075C5CC418F64423D3EA773AEC3C838A51508569C:com.hrvatskitelekom.m.mojT"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2367_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2367_T-Mobile.xml
deleted file mode 100644
index 86e7525c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2367_T-Mobile.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="46D1992DA14DCDAB5CDF8D3C4C965D5D11A2534A40F323DFFF127751B706724F:pl.tmobile.miboa"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2378_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2378_Vodafone.xml
deleted file mode 100644
index 46cc3d38..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2378_Vodafone.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="default_mtu_int" value="1358"/>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2385_Slovak-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2385_Slovak-Telekom.xml
deleted file mode 100644
index 43f52ad6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2385_Slovak-Telekom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="A277FB2118A4C504F4F4CEC1AC21FC90376C530F113C1DA2C802A88FD55BA96B:com.telekom.portal"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2386_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2386_T-Mobile.xml
deleted file mode 100644
index fa199ccf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2386_T-Mobile.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="66D1423581F5C3FC7AE91C53DCEFA2AD7DEF0265FE261ED4FB7423E0F57C0AFE:nl.oberon.tmobile.my"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2394_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2394_T-Mobile.xml
deleted file mode 100644
index 8c54c73e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2394_T-Mobile.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="A1F6E367AC03F6A0018EBF1F1FCDD971129F5BAA2A77FC1782B9ECF3C819FEF7:cz.tmobile.oneapp"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2395_Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2395_Telekom.xml
deleted file mode 100644
index 48d841a5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2395_Telekom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="display_hd_audio_property_bool" value="false"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="auto_retry_failed_wifi_emergency_call" value="true"/>
-    <string name="default_vm_number_string">3311</string>
-    <string name="carrier_name_string">Telekom</string>
-    <string-array name="carrier_certificate_string_array" num="7">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/>
-        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
-        <item value="A3EFD06CA935A1D530F58F4472BC0FBA0611C7CEE21111FDEDFEAFB477B36F83:de.congstar.meincongstar"/>
-        <item value="326D12BC1FC90959DA07EFE47CC23949E4E565E78BF7BECFAA919F7F7D9276A3:de.congstar.fraenk"/>
-        <item value="4D78B2097356EE799070B338663690098602E9CE31C33FEBAA5D50D4548B2E31:de.congstar.ja,de.congstar.penny"/>
-        <item value="B9A55B3103894C87ABDF014BC15AB42CC4EC7E226B59CA1539F5C2AFF6D64CF7:de.telekom.bflexz"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2396_Mkedonski-Telecom-AD-Skopje.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2396_Mkedonski-Telecom-AD-Skopje.xml
deleted file mode 100644
index ece25cf5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2396_Mkedonski-Telecom-AD-Skopje.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="1C97892608B6AA80C3B4AC5D41E3B4C4D5551C0585A923B4D82F77A961F3427E:com.morescreens.mkt"/>
-        <item value="6EA117F9EF012340F40CF1AC370F5E908AC30377FEECDC2D9A7161B654FFB9E6:com.telekom.telekommk"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_23_Vodafone-RO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_23_Vodafone-RO.xml
deleted file mode 100644
index 40a40ac5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_23_Vodafone-RO.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="95D4443A60C07CCDEF793547C0CD76221D94A071BDAEE4D6CCE0F2C4E59D64F7:ro.vodafone.mcare.android"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2401_Magyar-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2401_Magyar-Telekom.xml
deleted file mode 100644
index 93b43a68..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2401_Magyar-Telekom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="7A9B86BEA0983E9999B7991A29654B8E6BE50AEAFD38200DCF2B32B951F0AA5D:hu.telekom.telekomapp"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2408_Vmax-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2408_Vmax-Telecom.xml
deleted file mode 100644
index 67a7f7a7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2408_Vmax-Telecom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2409_Dishnet-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2409_Dishnet-Wireless.xml
deleted file mode 100644
index b999bbab..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2409_Dishnet-Wireless.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2411_Wireless-City-Planning.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2411_Wireless-City-Planning.xml
deleted file mode 100644
index 2eeb81b3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2411_Wireless-City-Planning.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="maxMessageTextSize" value="-1"/>
-    <int name="recipientLimit" value="-1"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="307200"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2412_ACeS.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2412_ACeS.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2412_ACeS.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2413_TOT.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2413_TOT.xml
deleted file mode 100644
index d01ce2f6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2413_TOT.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="roaming_operator_string_array" num="1">
-        <item value="520"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2414_Airtel-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2414_Airtel-Wireless.xml
deleted file mode 100644
index 8fb32c47..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2414_Airtel-Wireless.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2415_Fonyou-Telecom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2415_Fonyou-Telecom.xml
deleted file mode 100644
index ab81ad82..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2415_Fonyou-Telecom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2416_Fastweb-SpA.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2416_Fastweb-SpA.xml
deleted file mode 100644
index 7ff20fee..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2416_Fastweb-SpA.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2417_Fizz.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2417_Fizz.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2417_Fizz.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2420_ION.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2420_ION.xml
deleted file mode 100644
index 79af7b89..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2420_ION.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="21409" />
-            <item value="214010" />
-            <item value="214011" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214015" />
-            <item value="214016" />
-            <item value="214017" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml
deleted file mode 100644
index 99b1f23f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2429_Rakuten-Mobile-MNO.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,15;connected,legacy,15;connected_mmwave,not_restricted_rrc_con,15;connected,not_restricted_rrc_con,15;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="enabledMMS" value="false"/>
-    <int name="maxMessageSize" value="2097152"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="99F04B13AA9672BD6292921D88365D9C1953BD6078E4BFAD344D02CDCFACF17E:jp.co.rakuten.mobile.ecare"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2433_Assurance-Wireless.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2433_Assurance-Wireless.xml
deleted file mode 100644
index e57ff063..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2433_Assurance-Wireless.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="1">
-        <item value="*2"/>
-    </string-array>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,30;connected,legacy,30;not_restricted_rrc_idle,legacy,30;not_restricted_rrc_con,legacy,30</string>
-    <int-array name="additional_nr_advanced_bands_int_array" num="1">
-        <item value="41"/>
-    </int-array>
-    <boolean name="enable_nr_advanced_for_roaming_bool" value="false"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2459_GigSky.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2459_GigSky.xml
deleted file mode 100644
index ebcf6fc7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2459_GigSky.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="force_home_network_bool" value="true"/>
-    <boolean name="inflate_signal_strength_bool" value="true" />
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2468_Tele2.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2468_Tele2.xml
deleted file mode 100644
index fa199ccf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2468_Tele2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="66D1423581F5C3FC7AE91C53DCEFA2AD7DEF0265FE261ED4FB7423E0F57C0AFE:nl.oberon.tmobile.my"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2469_Altan.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2469_Altan.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2469_Altan.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2470_IENTC.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2470_IENTC.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2470_IENTC.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2471_NeWWW.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2471_NeWWW.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2471_NeWWW.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2473_Megacable.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2473_Megacable.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2473_Megacable.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2474_Netwey.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2474_Netwey.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2474_Netwey.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2475_Retemex.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2475_Retemex.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2475_Retemex.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2476_Walmart MX.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2476_Walmart MX.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2476_Walmart MX.xml	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2477_Iusacomm.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2477_Iusacomm.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2477_Iusacomm.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2478_CFE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2478_CFE.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2478_CFE.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2479_Inten.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2479_Inten.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2479_Inten.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2480_Diveracy.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2480_Diveracy.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2480_Diveracy.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2481_Diri.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2481_Diri.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2481_Diri.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2482_Topos.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2482_Topos.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2482_Topos.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2483_Guruweb.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2483_Guruweb.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2483_Guruweb.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2484_Ubix.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2484_Ubix.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2484_Ubix.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2485_Rocketel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2485_Rocketel.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2485_Rocketel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2486_Redpotencia.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2486_Redpotencia.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2486_Redpotencia.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2487_Adinteli.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2487_Adinteli.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2487_Adinteli.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2488_Izzi.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2488_Izzi.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2488_Izzi.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2489_Adm.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2489_Adm.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2489_Adm.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2490_Ads.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2490_Ads.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2490_Ads.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2491_Yonder.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2491_Yonder.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2491_Yonder.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2492_Arlonet.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2492_Arlonet.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2492_Arlonet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2493_Tridex.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2493_Tridex.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2493_Tridex.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2494_Wimo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2494_Wimo.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2494_Wimo.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2495_Oui.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2495_Oui.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2495_Oui.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2496_Freedompop.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2496_Freedompop.xml
deleted file mode 100644
index 920dda9f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2496_Freedompop.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2512_Goodspeed.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2512_Goodspeed.xml
deleted file mode 100644
index 54357e9a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2512_Goodspeed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="force_home_network_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2514_povo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2514_povo.xml
deleted file mode 100644
index 0e453a88..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2514_povo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="disable_dun_apn_while_roaming_with_preset_apn_bool" value="true"/>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">povo</string>
-    <string-array name="carrier_certificate_string_array" num="4">
-        <item value="108897103871B684844AA7C791E0C812AB3966576FB5D3713C2D11794C0600AD:com.kddi.cs.app001"/>
-        <item value="5EA3181DF228B4F8B0DECC10B21783F8C6C397F1290F2395FE3E6FDB2B52E991:jp.uqmobile.uqmobileportalapp"/>
-        <item value="891ABE3F0A0D794AD46200DC2374AFF61AFA82711C360EE0CB49C3E6BB2BA006:jp.auone.wallet"/>
-        <item value="1001568BB4A4E65F68C8B0F2E5C9EBC97FF719898F39E421DAF29A8DACEAAF1B:com.kddi.android.cmail"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2524_eRate.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2524_eRate.xml
deleted file mode 100644
index 3239345c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2524_eRate.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="2097152"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2530_Simpel.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2530_Simpel.xml
deleted file mode 100644
index d7d9be0b..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2530_Simpel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="66D1423581F5C3FC7AE91C53DCEFA2AD7DEF0265FE261ED4FB7423E0F57C0AFE:nl.oberon.tmobile.my"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2532_Xfinity-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2532_Xfinity-Mobile.xml
deleted file mode 100644
index cfbd4364..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2532_Xfinity-Mobile.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="953F5A4C22E7FD16ADC3F12EB038682AAD377FEF9A18B9D12C1ABEA78911C749:com.xfinity.digitalhome"/>
-        <item value="06AADA946110E64414AEBE3AF34AE06BAF239EF75C947149FB67263D8A2547C3:com.xfinity.digitalhome.debug"/>
-        <item value="141E264EB08B576F6C32E49FD47A34300553A132EC5EB1DD58B354A0B15A5E40:com.xfinitymobile.cometcarrierservice"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2548_Ice.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2548_Ice.xml
deleted file mode 100644
index b986b6da..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2548_Ice.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  ~ Copyright (C) 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<carrier_config>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2551_Magenta_Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2551_Magenta_Telekom.xml
deleted file mode 100644
index 8178f877..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2551_Magenta_Telekom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <boolean name="display_hd_audio_property_bool" value="false" />
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2556_Xfinity_Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2556_Xfinity_Mobile.xml
deleted file mode 100644
index bcadf575..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2556_Xfinity_Mobile.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-<boolean name="aliasEnabled" value="true"/>
-<boolean name="allowAttachAudio" value="false"/>
-<boolean name="allow_add_call_during_video_call" value="false"/>
-<boolean name="allow_adding_apns_bool" value="false"/>
-<boolean name="allow_hold_in_ims_call" value="false"/>
-<boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false"/>
-<boolean name="apn_expand_bool" value="false"/>
-<boolean name="broadcast_emergency_call_state_changes_bool" value="true"/>
-<boolean name="carrier_allow_turnoff_ims_bool" value="false"/>
-<boolean name="carrier_name_override_bool" value="true"/>
-<boolean name="carrier_promote_wfc_on_call_fail_bool" value="true"/>
-<boolean name="carrier_volte_available_bool" value="true"/>
-<boolean name="carrier_volte_provisioned_bool" value="true"/>
-<boolean name="carrier_volte_provisioning_required_bool" value="true"/>
-<boolean name="carrier_vt_available_bool" value="true"/>
-<boolean name="carrier_wfc_ims_available_bool" value="true"/>
-<boolean name="cdma_home_registered_plmn_name_override_bool" value="true"/>
-<boolean name="disable_voice_barring_notification_bool" value="true"/>
-<boolean name="drop_video_call_when_answering_audio_call_bool" value="true"/>
-<boolean name="dtmf_type_enabled_bool" value="true"/>
-<boolean name="editable_wfc_mode_bool" value="false"/>
-<boolean name="editable_wfc_roaming_mode_bool" value="true"/>
-<boolean name="enableMMSReadReports" value="false"/>
-<boolean name="enableMultipartSMS" value="true"/>
-<boolean name="enabledNotifyWapMMSC" value="true"/>
-<boolean name="enabledTransID" value="true"/>
-<boolean name="gps.persist_lpp_mode_bool" value="true"/>
-<boolean name="is_ims_conference_size_enforced_bool" value="true"/>
-<boolean name="mdn_is_additional_voicemail_number_bool" value="true"/>
-<boolean name="mmsCloseConnection" value="true"/>
-<boolean name="notify_handover_video_from_lte_to_wifi_bool" value="true"/>
-<boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/>
-<boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/>
-<boolean name="operator_selection_expand_bool" value="true"/>
-<boolean name="prefer_2g_bool" value="false"/>
-<boolean name="rtt_supported_bool" value="true"/>
-<boolean name="show_apn_setting_cdma_bool" value="true"/>
-<boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
-<boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
-<boolean name="support_downgrade_vt_to_audio_bool" value="false"/>
-<boolean name="support_pause_ims_video_calls_bool" value="true"/>
-<boolean name="support_swap_after_merge_bool" value="false"/>
-<boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true"/>
-<boolean name="ims.enable_presence_publish_bool" value="true"/>
-<boolean name="video_calls_can_be_hd_audio" value="false"/>
-<boolean name="voicemail_notification_persistent_bool" value="true"/>
-<boolean name="wifi_calls_can_be_hd_audio" value="false"/>
-<boolean name="world_mode_enabled_bool" value="true"/>
-<int name="aliasMaxChars" value="48"/>
-<int name="aliasMinChars" value="2"/>
-<int name="carrier_default_wfc_ims_mode_int" value="1"/>
-<int name="ims_conference_size_limit_int" value="5"/>
-<int name="lte_earfcns_rsrp_boost_int" value="6"/>
-<int name="maxImageHeight" value="1944"/>
-<int name="maxImageWidth" value="2592"/>
-<int name="maxMessageSize" value="1258291"/>
-<int name="maxSubjectLength" value="80"/>
-<int name="recipientLimit" value="20"/>
-<int name="smsToMmsTextThreshold" value="7"/>
-<int name="volte_replacement_rat_int" value="6"/>
-<int name="wfc_spn_format_idx_int" value="1"/>
-<string name="carrier_eri_file_name_string">eri_311480_BA01450000000000.xml</string>
-<string name="carrier_name_string">Xfinity Mobile</string>
-<string name="cdma_home_registered_plmn_name_string">Xfinity Mobile</string>
-<string name="default_vm_number_string">*86</string>
-<string name="emailGatewayNumber">6245</string>
-<string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-<string name="sim_country_iso_override_string">us</string>
-<string name="uaProfTagName">Profile</string>
-<string-array name="boosted_lte_earfcns_string_array" num="2">
-<item value="600-1199"/>
-<item value="1950-2399"/>
-</string-array>
-<string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
-<item value="*71"/>
-<item value="*72"/>
-</string-array>
-<string-array name="telephony_data_setup_retry_rules_string_array" num="4">
-<item value="capabilities=eims, retry_interval=1000, maximum_retries=20"/>
-<!--  Defines permanent failures. Removed ACTIVATION_REJECT_GGSN and PROTOCOL_ERRORS from default.  -->
-<item value="permanent_fail_causes=8|27|28|29|32|33|35|50|51|-5|-6|65537|65538|-3|65543|65547|2252|2253|2254, retry_interval=2500"/>
-<item value="capabilities=mms|supl|cbs, retry_interval=2000"/>
-<item value="capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000, maximum_retries=20"/>
-</string-array>
-<string-array name="carrier_metered_apn_types_strings" num="3">
-<item value="default"/>
-<item value="dun"/>
-<item value="supl"/>
-</string-array>
-<string-array name="carrier_metered_roaming_apn_types_strings" num="4">
-<item value="default"/>
-<item value="dun"/>
-<item value="mms"/>
-<item value="supl"/>
-</string-array>
-<string-array name="dial_string_replace_string_array" num="2">
-<item value="*611:+19085594899"/>
-<item value="*86:+1MDN"/>
-</string-array>
-<string-array name="filtered_cnap_names_string_array" num="2">
-<item value="WIRELESS CALLER"/>
-<item value="UNKNOWN NAME"/>
-</string-array>
-<string-array name="ims_reasoninfo_mapping_string_array" num="10">
-<item value="332|simultaneous call limit has already been reached|1403"/>
-<item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403"/>
-<item value="338|another device sent all devices busy response|1404"/>
-<item value="501|call completion elsewhere|1014"/>
-<item value="501|call has been pulled by another device|1016"/>
-<item value="510|call has been pulled by another device|1016"/>
-<item value="501|another device sent all devices busy response|1404"/>
-<item value="510|another device sent all devices busy response|1404"/>
-<item value="1014|call has been pulled by another device|1016"/>
-<item value="*|Call is dropped due to Wi-Fi signal is degraded|1407"/>
-</string-array>
-<string-array name="read_only_apn_fields_string_array" num="20">
-<item value="name"/>
-<item value="proxy"/>
-<item value="port"/>
-<item value="user"/>
-<item value="password"/>
-<item value="server"/>
-<item value="mmsc"/>
-<item value="mmsproxy"/>
-<item value="mmsport"/>
-<item value="mcc"/>
-<item value="mnc"/>
-<item value="authtype"/>
-<item value="type"/>
-<item value="protocol"/>
-<item value="roaming_protocol"/>
-<item value="bearer"/>
-<item value="bearer_bitmask"/>
-<item value="carrier_enabled"/>
-<item value="mvno_type"/>
-<item value="mvno_match_data"/>
-</string-array>
-<int-array name="lte_rsrp_thresholds_int_array" num="4">
-<item value="-115"/>
-<item value="-105"/>
-<item value="-95"/>
-<item value="-85"/>
-</int-array>
-<int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11">
-<item value="64"/>
-<item value="65"/>
-<item value="66"/>
-<item value="76"/>
-<item value="77"/>
-<item value="78"/>
-<item value="79"/>
-<item value="80"/>
-<item value="81"/>
-<item value="82"/>
-<item value="83"/>
-</int-array>
-    <string-array name="carrier_certificate_string_array" num="3">
-        <item value="953F5A4C22E7FD16ADC3F12EB038682AAD377FEF9A18B9D12C1ABEA78911C749:com.xfinity.digitalhome"/>
-        <item value="06AADA946110E64414AEBE3AF34AE06BAF239EF75C947149FB67263D8A2547C3:com.xfinity.digitalhome.debug"/>
-        <item value="141E264EB08B576F6C32E49FD47A34300553A132EC5EB1DD58B354A0B15A5E40:com.xfinitymobile.cometcarrierservice"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2567_SSi-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2567_SSi-Mobile.xml
deleted file mode 100644
index 41099204..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2567_SSi-Mobile.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="default_mtu_int" value="1376"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string">SSi Mobile</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="302480"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2568_Eeyou-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2568_Eeyou-Mobility.xml
deleted file mode 100644
index 3304596d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2568_Eeyou-Mobility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <int name="default_mtu_int" value="1376"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string name="carrier_name_string">Eeyou Mobilité</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="302480"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_25_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_25_Vodafone.xml
deleted file mode 100644
index 866ff82c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_25_Vodafone.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <!-- wfcSpnFormat is "%s WiFi Calling" -->
-    <int name="wfc_spn_format_idx_int" value="11"/>
-    <int name="default_mtu_int" value="1358"/>
-    <string name="default_vm_number_string">5500</string>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="0318ED2A8B33CE173C7ABE3F647D263810994CF489C8FCD27A8CAAFCF2822A88:com.appseleration.android.selfcare,com.appseleration.speedtest"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_26_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_26_Vodafone.xml
deleted file mode 100644
index e4cc292c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_26_Vodafone.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="csp_enabled_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <int name="default_mtu_int" value="1358"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_27_SFR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_27_SFR.xml
deleted file mode 100644
index d8da3b68..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_27_SFR.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="support_ims_conference_event_package_bool" value="false"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="5f00d30d66af74dd43e98a00695362719d8e7c9e7de367b962769cdfe12bd9da:com.sfr.otp,com.sfr.mobileconnect,com.sfr.android.moncompte,com.sfr.android.redmoncompte"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_28_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_28_Vodafone.xml
deleted file mode 100644
index 4f79c77e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_28_Vodafone.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="smsToMmsTextThreshold" value="10"/>
-    <int name="default_mtu_int" value="1358"/>
-    <string name="default_vm_number_string">121</string>
-    <string-array name="feature_access_codes_string_array" num="3">
-        <item value="153"/>
-        <item value="132"/>
-        <item value="45"/>
-    </string-array>
-    <string-array name="read_only_apn_types_string_array" num="0"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="2E26357C65C1F858CE0C798AA7EFB38922E8D334F12DAD4A3963007DFBBC5677:com.myvodafoneapp"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_29_Vodafone.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_29_Vodafone.xml
deleted file mode 100644
index 0f3778ec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_29_Vodafone.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <int name="default_mtu_int" value="1358"/>
-    <string name="default_vm_number_string">42020</string>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="EEFD6F2D255BAE73FDEDB112CF60DEEBD82ABFD1846D7E8A4B4896EF6A1BAE4A:it.vodafone.my190"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2_EE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2_EE.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_2_EE.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_30_Optus.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_30_Optus.xml
deleted file mode 100644
index 6e9e160f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_30_Optus.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_32_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_32_Orange.xml
deleted file mode 100644
index d9841b42..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_32_Orange.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="allow_ussd_requests_via_telephony_manager_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="614400"/>
-    <string-array name="carrier_vvm_package_name_string_array" num="1">
-        <item value="com.orange.vvm"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,com.orange.orangeetmoi,com.orange.mysosh,com.orange.obl,com.orange.orangepro,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.orangeetmoi</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_33_TIM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_33_TIM.xml
deleted file mode 100644
index 7ff20fee..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_33_TIM.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_34_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_34_Movistar.xml
deleted file mode 100644
index ca9cdfbf..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_34_Movistar.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="512000"/>
-    <string-array name="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21404"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-  </string-array>
-  <string name="call_redirection_service_component_name_string">com.movistar.android.mimovistar.es/com.tuenti.messenger.callinterceptor.CallInterceptorService</string>
-  <string-array name="carrier_service_name_array" num="7">
-    <item value="Atención al Cliente"/>
-    <item value="At. Cliente (extranjero)"/>
-    <item value="Inf. 11822"/>
-    <item value="Activar Buzón Movistar"/>
-    <item value="Emergencias"/>
-    <item value="Atención Negocios"/>
-    <item value="At. Ciberseguridad INCIBE"/>
-  </string-array>
-  <string-array name="carrier_service_number_array" num="7">
-    <item value="1004"/>
-    <item value="+34699991004"/>
-    <item value="11822"/>
-    <item value="22500"/>
-    <item value="112"/>
-    <item value="900101010"/>
-    <item value="017"/>
-  </string-array>
-  <boolean name="carrier_allow_transfer_ims_call_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_3_Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_3_Telekom.xml
deleted file mode 100644
index 20c55556..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_3_Telekom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <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="8">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter,de.telekom.android.customercenter"/>
-        <item value="D2CB8644879FEC7DD2556673ADAF8F68899A4F2A93EEE14AD9482247B16AD02F:de.telekom.smartcredentials.entitlements"/>
-        <item value="A3EFD06CA935A1D530F58F4472BC0FBA0611C7CEE21111FDEDFEAFB477B36F83:de.congstar.meincongstar"/>
-        <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_493_SETAR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_493_SETAR.xml
deleted file mode 100644
index f9140353..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_493_SETAR.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">SETAR</string>
-    <int name="default_mtu_int" value="1500"/>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G_Plus,connected:5G,not_restricted_rrc_idle:5G,not_restricted_rrc_con:5G</string>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="enabledMMS" value="true"/>
-    <boolean name="enableMultipartSMS" value="true"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="false"/>
-    <boolean name="carrier_wfc_ims_available_bool" value="false" />
-    <boolean name="carrier_vt_available_bool" value="false" />
-    <boolean name="hide_ims_apn_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_4_Magenta-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_4_Magenta-Telekom.xml
deleted file mode 100644
index eba572fc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_4_Magenta-Telekom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-        <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_529_Claro-BR.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_529_Claro-BR.xml
deleted file mode 100644
index 79c2e0c5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_529_Claro-BR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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">
-      <item value="65C25B1D82052E88BC0F1A1E3773746A44F2219C06272F4CA219C4D4928EB9A7:br.com.claro.flex,br.com.claro.flex.stg"/>
-      <item value="8063CE3CC5B3F69D1B89D0218CE1B5B2FBE66F63F9046C4E0FBF1D5F44D16F4C:com.nvt.cs"/>
-      <item value="FAC61745DC0903786FB9EDE62A962B399F7348F0BB6F899B8332667591033B9C:com.claroapp.quality.assurance,com.claroapp.user.acceptance.test,com.claroapp.development"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_530_Vivo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_530_Vivo.xml
deleted file mode 100644
index 57ae9c6b..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_530_Vivo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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="2">
-    <item value="406D7DE3DF7F58F4DDE4758ED79280566D9BB8CACF46DB725D6AFCB7E3D6EE8E:br.com.vivo"/>
-    <item value="45A8BFA55CA3B9DB73D35F0C9961803A47BC9B539053C0CB820DF0DB839EE85A:br.com.vivo.meuvivoempresas"/>
-  </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_540_Brasil-Telecom-GSM.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_540_Brasil-Telecom-GSM.xml
deleted file mode 100644
index 72968600..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_540_Brasil-Telecom-GSM.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_567_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_567_Orange.xml
deleted file mode 100644
index 4e5bb86b..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_567_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.obw,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.obw</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_576_Bell-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_576_Bell-Mobility.xml
deleted file mode 100644
index a53f1726..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_576_Bell-Mobility.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <boolean name="enableGroupMms" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="voicemail_notification_persistent_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="smsToMmsTextThreshold" value="8"/>
-    <int name="default_mtu_int" value="1428"/>
-    <string name="emailGatewayNumber">6245</string>
-    <string name="gps.lpp_profile">2</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="302"/>
-    </string-array>
-    <string-array name="read_only_apn_types_string_array" num="1">
-        <item value="*"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_578_MTS-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_578_MTS-Mobility.xml
deleted file mode 100644
index a89bac22..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_578_MTS-Mobility.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="smsToMmsTextThreshold" value="6"/>
-    <int name="recipientLimit" value="20"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxSubjectLength" value="80"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="default_mtu_int" value="1430"/>
-    <string-array name="non_roaming_operator_string_array" num="5">
-        <item value="302220"/>
-        <item value="302370"/>
-        <item value="302610"/>
-        <item value="302720"/>
-        <item value="302780"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_580_Sask-Tel-Mobility.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
deleted file mode 100644
index 0db59848..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <int name="default_mtu_int" value="1358"/>
-    <string name="sim_country_iso_override_string">ca</string>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="302"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_5_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_5_T-Mobile.xml
deleted file mode 100644
index a56880cc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_5_T-Mobile.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<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">
-        <item value="191A9C9711282CCD1133C9F9EFA7D1077BCAAFB99E379A438207EE0D86218917:de.telekom.tsc"/>
-        <item value="EE403A97B076CDEA7A8E8E9BC8011C0A45CEC08905F400EBECE62C946614977D:de.telekom.appstarter"/>
-        <item value="66D1423581F5C3FC7AE91C53DCEFA2AD7DEF0265FE261ED4FB7423E0F57C0AFE:nl.oberon.tmobile.my"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_625_Movistar.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_625_Movistar.xml
deleted file mode 100644
index 82953b3d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_625_Movistar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-  <string-array name="carrier_service_name_array" num="1">
-    <item value="Whatsapp Movistar Colombia"/>
-  </string-array>
-  <string-array name="carrier_service_number_array" num="1">
-    <item value="+573152333333"/>
-  </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_675_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_675_Orange.xml
deleted file mode 100644
index f87f54da..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_675_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.mobinilandme,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.mobinilandme</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_678_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_678_Orange.xml
deleted file mode 100644
index c7c065ec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_678_Orange.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="1048576"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,com.orange.miorange,com.orange.bluu.jazztel,com.orange.miamena,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.miorange</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_679_Yoigo.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_679_Yoigo.xml
deleted file mode 100644
index 7b733f7a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_679_Yoigo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="non_roaming_operator_string_array" num="20">
-        <item value="21401"/>
-        <item value="21402"/>
-        <item value="21403"/>
-        <item value="21405"/>
-        <item value="21406"/>
-        <item value="21407"/>
-        <item value="21408"/>
-        <item value="21409"/>
-        <item value="214010"/>
-        <item value="214011"/>
-        <item value="214012"/>
-        <item value="214013"/>
-        <item value="214014"/>
-        <item value="214015"/>
-        <item value="214016"/>
-        <item value="214017"/>
-        <item value="214018"/>
-        <item value="214019"/>
-        <item value="214020"/>
-        <item value="214021"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_6_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_6_T-Mobile.xml
deleted file mode 100644
index 62717db7..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_6_T-Mobile.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <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="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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_717_Virgin.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_717_Virgin.xml
deleted file mode 100644
index 49f0304f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_717_Virgin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_name_string">Virgin</string>
-    <string name="sim_country_iso_override_string">gb</string>
-    <string-array name="non_roaming_operator_string_array" num="6">
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-    <string-array name="wfc_operator_error_codes_string_array" num="1">
-        <item value="REG09|0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_718_EE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_718_EE.xml
deleted file mode 100644
index ed7105d1..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_718_EE.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true"/>
-    <boolean name="prefer_2g_bool" value="false"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="wfc_spn_format_idx_int" value="1"/>
-    <string name="carrier_name_string">EE</string>
-    <string-array name="non_roaming_operator_string_array" num="6">
-        <item value="23430"/>
-        <item value="23431"/>
-        <item value="23432"/>
-        <item value="23433"/>
-        <item value="23434"/>
-        <item value="23486"/>
-    </string-array>
-    <string-array name="wfc_operator_error_codes_string_array" num="1">
-        <item value="REG09|0"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_739_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_739_Orange.xml
deleted file mode 100644
index 0a1ac010..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_739_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ogn,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ogn</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_742_Orange-Caraïbe-Mobiles.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_742_Orange-Caraïbe-Mobiles.xml
deleted file mode 100644
index 3085cb62..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_742_Orange-Caraïbe-Mobiles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="2">
-        <item value="20801"/>
-        <item value="20815"/>
-    </string-array>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.caraibe.orangeetmoicaraibe,com.orange.caraibe.soshcaraibe,com.orange.update,com.orange.phone"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.caraibe.orangeetmoicaraibe</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_747_COSMOTE.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_747_COSMOTE.xml
deleted file mode 100644
index 61dd0ca5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_747_COSMOTE.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_767_中國移動香港-China-Mobile-HK.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_767_中國移動香港-China-Mobile-HK.xml
deleted file mode 100644
index 12f75e1d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_767_中國移動香港-China-Mobile-HK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="support_tdscdma_roaming_networks_string_array" num="4">
-        <item value="46000"/>
-        <item value="46002"/>
-        <item value="46007"/>
-        <item value="46008"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_773_Claro-HN.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_773_Claro-HN.xml
deleted file mode 100644
index 6c3b6772..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_773_Claro-HN.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="4">
-      <item value="7D7226772D4F6D778FEF53A36BE15AD78D8D9D4BC4CE00C5F2E3216C19480FA0"/>
-      <item value="2333f4065b9f054363ca63d1866cc168f45d641645b31131b14e173b9c922d15:co.sitic.pp"/>
-      <item value="14d54c64599a3e9a3b766239b160de3935093e0a:co.sitic.pp"/>
-      <item value="f54cac11d5af77a5f10c21d536ad5d1c40b00d63a92cab917aa84dc714d622d8:co.sitic.pp"/>
-    </string-array>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="2">
-        <item value="*1"/>
-        <item value="*5"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_789_Indosat-M3.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_789_Indosat-M3.xml
deleted file mode 100644
index 5dba7018..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_789_Indosat-M3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="non_roaming_operator_string_array" num="1">
-        <item value="51001"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml
deleted file mode 100644
index ceebff41..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_796_Partner-Communications-Co-Ltd.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_name_override_bool" value="true"/>
-    <string name="carrier_name_string">Orange-IL</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_7_T-Mobile.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_7_T-Mobile.xml
deleted file mode 100644
index 1948d14c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_7_T-Mobile.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-        <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_802_Idea.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_802_Idea.xml
deleted file mode 100644
index 04676447..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_802_Idea.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
-    <string-array name="roaming_operator_string_array" num="2">
-        <item value="404"/>
-        <item value="405"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_849_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_849_Orange.xml
deleted file mode 100644
index fe916aa9..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_849_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.ojo,com.orange.phone.mea,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.ojo</string>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_850_NTT_DOCOMO.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_850_NTT_DOCOMO.xml
deleted file mode 100644
index af99f3d3..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_850_NTT_DOCOMO.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string name="5g_icon_configuration_string">connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G</string>
-    <string name="5g_icon_display_grace_period_string">connected_mmwave,legacy,31;connected,legacy,31;connected_mmwave,not_restricted_rrc_con,31;connected,not_restricted_rrc_con,31;not_restricted_rrc_idle,not_restricted_rrc_con,15</string>
-    <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
-    <boolean name="allow_hold_call_during_emergency_bool" value="false"/>
-    <boolean name="carrier_volte_available_bool" value="true"/>
-    <boolean name="enabledMMS" value="false"/>
-    <boolean name="hide_ims_apn_bool" value="true"/>
-    <boolean name="hide_lte_plus_data_icon_bool" value="false"/>
-    <boolean name="ignore_data_enabled_changed_for_video_calls" value="true"/>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="volte_replacement_rat_int" value="3"/>
-    <string-array name="ims_reasoninfo_mapping_string_array" num="1">
-        <item value="332||510"/>
-    </string-array>
-    <string-array name="missed_incoming_call_sms_originator_string_array" num="2">
-        <item value="DoCoMo SMS"/>
-        <item value="DoCoMo"/>
-    </string-array>
-    <string-array name="missed_incoming_call_sms_pattern_string_array" num="5">
-        <!-- Incoming phone call history with caller id -->
-        <item value="^(?&lt;month&gt;0[1-9]|1[012])/(?&lt;day&gt;0[1-9]|1[0-9]|2[0-9]|3[0-1])\s(?&lt;hour&gt;[0-1][0-9]|2[0-3]):(?&lt;minute&gt;[0-5][0-9])\s(\n|\s\n)(?&lt;callerId&gt;\+[0-9]{1,16}|[0-9]{1,17})\b\s*"/>
-        <!-- Incoming phone call history without caller id -->
-        <item value="^(?&lt;month&gt;0[1-9]|1[012])/(?&lt;day&gt;0[1-9]|1[0-9]|2[0-9]|3[0-1])\s(?&lt;hour&gt;[0-1][0-9]|2[0-3]):(?&lt;minute&gt;[0-5][0-9])\s\s\n(非通知設定|公衆電話|通知不可能)\b\s*"/>
-        <!-- Incoming video phone call history with caller id -->
-        <item value="^(?&lt;month&gt;0[1-9]|1[012])/(?&lt;day&gt;0[1-9]|1[0-9]|2[0-9]|3[0-1])\s(?&lt;hour&gt;[0-1][0-9]|2[0-3]):(?&lt;minute&gt;[0-5][0-9])\sﾃﾚﾋﾞ電話\s\n(?&lt;callerId&gt;\+[0-9]{1,16}|[0-9]{1,17})\b\s*"/>
-        <!-- Incoming video phone call history without caller id -->
-        <item value="^(?&lt;month&gt;0[1-9]|1[012])/(?&lt;day&gt;0[1-9]|1[0-9]|2[0-9]|3[0-1])\s(?&lt;hour&gt;[0-1][0-9]|2[0-3]):(?&lt;minute&gt;[0-5][0-9])\sﾃﾚﾋﾞ電話\s\n(非通知設定|公衆電話|通知不可能)\b\s*"/>
-        <!-- Incoming phone call while roaming history with caller id -->
-        <item value="^海外\s着信通知\(日本時間\)\s\n(?&lt;month&gt;0[1-9]|1[012])/(?&lt;day&gt;0[1-9]|1[0-9]|2[0-9]|3[0-1])\s(?&lt;hour&gt;[0-1][0-9]|2[0-3]):(?&lt;minute&gt;[0-5][0-9])\s\s\n(?&lt;callerId&gt;\+[0-9]{1,16}|[0-9]{1,17})\b\s*"/>
-    </string-array>
-    <boolean name="nr_timers_reset_if_non_endc_and_rrc_idle_bool" value="true"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_865_Safaricom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_865_Safaricom.xml
deleted file mode 100644
index 9c380de5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_865_Safaricom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-      <item value="F86A9F41A3616F82FAB02D4F23072FAFC7FF94B266C2E0A3558F097A95EA51D8:com.safaricom.android.financing,com.safaricom.android.simupoa_android"/>
-    </string-array>
-</carrier_config>
\ No newline at end of file
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_897_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_897_Orange.xml
deleted file mode 100644
index 9d227a30..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_897_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.phone,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.phone</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_8_Magyar-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_8_Magyar-Telekom.xml
deleted file mode 100644
index 2c63a9dc..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_8_Magyar-Telekom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-        <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_902_Méditélécom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_902_Méditélécom.xml
deleted file mode 100644
index 187a186e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_902_Méditélécom.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="102400"/>
-    <int name="maxImageWidth" value="2592"/>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.meditel.mediteletmoi,com.orange.phone.mea,com.orange.ma.entreprise,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.meditel.mediteletmoi</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_904_Orange.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_904_Orange.xml
deleted file mode 100644
index 374cd8ce..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_904_Orange.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <string-array name="carrier_certificate_string_array" num="1">
-        <item value="b67affcda89e3193b1595036d7c6cdbe22be5ca24c9f6cf93fc6b48f91d7310d:com.orange.myorange.omd,com.orange.phone,com.orange.update"/>
-    </string-array>
-    <string name="config_plans_package_override_string">com.orange.myorange.omd</string>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_958_Telenor.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_958_Telenor.xml
deleted file mode 100644
index 3239345c..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_958_Telenor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="2097152"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_959_Telia.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_959_Telia.xml
deleted file mode 100644
index 2630619f..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_959_Telia.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_968_Spark-NZ.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_968_Spark-NZ.xml
deleted file mode 100644
index 125f92e2..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_968_Spark-NZ.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
-    <boolean name="supportMmsContentDisposition" value="false"/>
-    <int name="maxImageHeight" value="1944"/>
-    <int name="maxMessageSize" value="614400"/>
-    <int name="maxImageWidth" value="2592"/>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_969_2degrees.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_969_2degrees.xml
deleted file mode 100644
index f933b452..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_969_2degrees.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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="roaming_operator_string_array" num="1">
-        <item value="53001"/>
-    </string-array>
-</carrier_config>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_9_Hrvaski-Telekom.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_9_Hrvaski-Telekom.xml
deleted file mode 100644
index d9406d88..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_carrierid_9_Hrvaski-Telekom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config>
-    <boolean name="display_hd_audio_property_bool" value="false"/>
-    <string-array name="mmi_two_digit_number_pattern_string_array" num="5">
-        <item value="92"/>
-        <item value="93"/>
-        <item value="94"/>
-        <item value="95"/>
-        <item value="96"/>
-    </string-array>
-    <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/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001001.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001001.xml
deleted file mode 100644
index 985952c4..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001001.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config spn="null">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config spn="^Tes.*">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config imsi="^001001.*">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001010.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001010.xml
deleted file mode 100644
index c084f419..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_001010.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<boolean name="show_apn_setting_cdma_bool" value="true" />
-<boolean name="carrier_volte_available_bool" value="true" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21409.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21409.xml
deleted file mode 100644
index 24936094..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21409.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21405" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="214010" />
-            <item value="214011" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214015" />
-            <item value="214016" />
-            <item value="214017" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21410.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21410.xml
deleted file mode 100644
index d1d93fec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21410.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21405" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="21409" />
-            <item value="214011" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214015" />
-            <item value="214016" />
-            <item value="214017" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21411.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21411.xml
deleted file mode 100644
index 01643e65..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21411.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21405" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="21409" />
-            <item value="214010" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214015" />
-            <item value="214016" />
-            <item value="214017" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21415.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21415.xml
deleted file mode 100644
index da6f0244..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21415.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21405" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="21409" />
-            <item value="214010" />
-            <item value="214011" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214016" />
-            <item value="214017" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21417.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21417.xml
deleted file mode 100644
index 002a28cb..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_21417.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="20">
-            <item value="21401" />
-            <item value="21402" />
-            <item value="21403" />
-            <item value="21404" />
-            <item value="21405" />
-            <item value="21406" />
-            <item value="21407" />
-            <item value="21408" />
-            <item value="21409" />
-            <item value="214010" />
-            <item value="214011" />
-            <item value="214012" />
-            <item value="214013" />
-            <item value="214014" />
-            <item value="214015" />
-            <item value="214016" />
-            <item value="214018" />
-            <item value="214019" />
-            <item value="214020" />
-            <item value="214021" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23427.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23427.xml
deleted file mode 100644
index 4e69d6f5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23427.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <string-array name="read_only_apn_types_string_array" num="1">
-            <item value="*" />
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23434.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23434.xml
deleted file mode 100644
index 680082b6..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_23434.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <int name="vvm_port_number_int" value="20481"/>
-        <string name="vvm_destination_number_string">887</string>
-        <string-array name="non_roaming_operator_string_array" num="6">
-            <item value="23430"/>
-            <item value="23431"/>
-            <item value="23432"/>
-            <item value="23433"/>
-            <item value="23434"/>
-            <item value="23486"/>
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_24024.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_24024.xml
deleted file mode 100644
index d649747a..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_24024.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-    <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-<int name="maxImageHeight" value="1944" />
-<int name="maxMessageSize" value="614400" />
-<int name="maxImageWidth" value="2592" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_246081.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_246081.xml
deleted file mode 100644
index 6c3f3238..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_246081.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<boolean name="show_apn_setting_cdma_bool" value="true" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_26801.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_26801.xml
deleted file mode 100644
index c889375e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_26801.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="show_4g_for_lte_data_icon_bool" value="true" />
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <int name="volte_replacement_rat_int" value="3" />
-        <string name="default_vm_number_string">123</string>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_310980.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_310980.xml
deleted file mode 100644
index d8b2d88e..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_310980.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <int name="maxImageHeight" value="1944" />
-        <int name="maxMessageSize" value="1048576" />
-        <int name="maxImageWidth" value="2592" />
-        <boolean name="enableSMSDeliveryReports" value="false" />
-        <boolean name="csp_enabled_bool" value="true" />
-        <boolean name="carrier_name_override_bool" value="true" />
-        <string name="carrier_name_string">AT&amp;T</string>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311012.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311012.xml
deleted file mode 100644
index 6f3cc0ec..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311012.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<int name="aliasMinChars" value="2" />
-<int name="smsToMmsTextThreshold" value="7" />
-<boolean name="enabledTransID" value="true" />
-<boolean name="aliasEnabled" value="true" />
-<boolean name="allowAttachAudio" value="false" />
-<int name="recipientLimit" value="20" />
-<string name="uaProfTagName">Profile</string>
-<int name="aliasMaxChars" value="48" />
-<int name="maxImageHeight" value="1944" />
-<int name="maxSubjectLength" value="80" />
-<string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-<string name="emailGatewayNumber">6245</string>
-<int name="maxMessageSize" value="1258291" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledNotifyWapMMSC" value="true" />
-<boolean name="enableMultipartSMS" value="true" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311480.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311480.xml
deleted file mode 100644
index 1c2f22e5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_311480.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <!-- Tracfone Vzw shows empty string as SPN -->
-    <carrier_config gid1="BA01270000000000">
-        <boolean name="carrier_name_override_bool" value="true" />
-        <string name="carrier_name_string"></string>
-    </carrier_config>
-    <!-- XFINITY Mobile as operator name for Xfinity -->
-    <carrier_config gid1="BA01450000000000">
-        <boolean name="cdma_home_registered_plmn_name_override_bool" value="true" />
-        <string name="cdma_home_registered_plmn_name_string">XFINITY Mobile</string>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_44120.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_44120.xml
deleted file mode 100644
index 08b3e733..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_44120.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<int name="maxMessageTextSize" value="-1" />
-<int name="recipientLimit" value="-1" />
-<int name="maxImageHeight" value="1944" />
-<int name="maxMessageSize" value="307200" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="enabledMMS" value="true" />
-<boolean name="carrier_force_disable_etws_cmas_test_bool" value="true" />
-<boolean name="carrier_volte_available_bool" value="true" />
-<int name="volte_replacement_rat_int" value="3" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_45000.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_45000.xml
deleted file mode 100644
index 06a7ed0d..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_45000.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-<carrier_config>
-<int name="maxImageHeight" value="1944" />
-<int name="maxMessageSize" value="1048576" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="carrier_volte_available_bool" value="true" />
-</carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46610.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46610.xml
deleted file mode 100644
index 6a7bbf30..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46610.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="hide_lte_plus_data_icon_bool" value="false" />
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46656.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46656.xml
deleted file mode 100644
index 6a7bbf30..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46656.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="hide_lte_plus_data_icon_bool" value="false" />
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46668.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46668.xml
deleted file mode 100644
index 6a7bbf30..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_46668.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
-    <carrier_config>
-        <boolean name="hide_lte_plus_data_icon_bool" value="false" />
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52023.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52023.xml
deleted file mode 100644
index b4a5bab5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52023.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config_list>
-    <carrier_config>
-        <string-array name="roaming_operator_string_array" num="1">
-            <item value="520"/>
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52025.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52025.xml
deleted file mode 100644
index b4a5bab5..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_mccmnc_52025.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<carrier_config_list>
-    <carrier_config>
-        <string-array name="roaming_operator_string_array" num="1">
-            <item value="520"/>
-        </string-array>
-    </carrier_config>
-</carrier_config_list>
diff --git a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_no_sim.xml b/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_no_sim.xml
deleted file mode 100644
index a5a39c51..00000000
--- a/Patches/Common/android_packages_apps_CarrierConfig/carrier_config_no_sim.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<!-- This is a place for no SIM config values. The format and filtering rules
-     are the same as those in carrier_config*.xml files. This file is read
-     after any SIM card is removed or moves to non loaded state. -->
-<carrier_config_list>
-<carrier_config_list />
diff --git a/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.pb b/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.pb
deleted file mode 100644
index f116087d..00000000
Binary files a/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.pb and /dev/null differ
diff --git a/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.textpb b/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.textpb
deleted file mode 100644
index a71451f9..00000000
--- a/Patches/Common/android_packages_providers_TelephonyProvider/carrier_list.textpb
+++ /dev/null
@@ -1,12452 +0,0 @@
-carrier_id {
-  canonical_id: 1
-  carrier_name: "T-Mobile - US"
-  carrier_attribute {
-    mccmnc_tuple: "310026"
-    mccmnc_tuple: "310160"
-    mccmnc_tuple: "310200"
-    mccmnc_tuple: "310210"
-    mccmnc_tuple: "310220"
-    mccmnc_tuple: "310230"
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310250"
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "31026"
-    mccmnc_tuple: "310270"
-    mccmnc_tuple: "310300"
-    mccmnc_tuple: "310310"
-    mccmnc_tuple: "310490"
-    mccmnc_tuple: "310530"
-    mccmnc_tuple: "310640"
-    mccmnc_tuple: "310660"
-    mccmnc_tuple: "310800"
-    mccmnc_tuple: "311490"
-    mccmnc_tuple: "311660"
-    mccmnc_tuple: "311882"
-    mccmnc_tuple: "312250"
-  }
-}
-carrier_id {
-  canonical_id: 2
-  carrier_name: "EE"
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    imsi_prefix_xpattern: "2343041"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    gid1: "ee"
-    gid1: "eeff"
-  }
-}
-carrier_id {
-  canonical_id: 3
-  carrier_name: "Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    mccmnc_tuple: "26206"
-    gid1: "01"
-    gid1: "02"
-    gid1: "03"
-    gid1: "04"
-    gid1: "99"
-    gid1: "4B"
-    gid1: "4b"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    mccmnc_tuple: "26206"
-    spn: "Telekom.de"
-    spn: "T-Campus"
-    spn: "T-Mobile D"
-    spn: "Business"
-    spn: "Privat"
-  }
-}
-carrier_id {
-  canonical_id: 4
-  carrier_name: "Magenta Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "23203"
-    gid1: "01"
-    gid1: "31"
-    gid1: "32"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23207"
-    imsi_prefix_xpattern: "999999"
-  }
-}
-carrier_id {
-  canonical_id: 5
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    gid1: "FF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    spn: "T-Mobile NL"
-  }
-}
-carrier_id {
-  canonical_id: 6
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "23001"
-    spn: "T-Mobile CZ"
-    spn: "KAKTUS"
-    spn: "Mobil CZ"
-    spn: "RWE Mobil"
-    spn: "innogy"
-    spn: "PREmobil"
-  }
-}
-carrier_id {
-  canonical_id: 7
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "26002"
-    gid1: "11"
-    gid1: "12"
-    gid1: "16"
-    gid1: "17"
-    gid1: "21"
-    gid1: "22"
-    gid1: "23"
-    gid1: "24"
-    gid1: "26"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26002"
-    spn: "T-Mobile.pl"
-    spn: "T-Mobile.pl Q"
-    spn: "heyah"
-    spn: "tu biedronka"
-  }
-}
-carrier_id {
-  canonical_id: 8
-  carrier_name: "Magyar Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "21630"
-    spn: "Telekom HU"
-    spn: "T-Mobile H"
-  }
-}
-carrier_id {
-  canonical_id: 9
-  carrier_name: "Hrvatski Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "21901"
-    mccmnc_tuple: "21920"
-    spn: "HT-Campus"
-    spn: "HT HR"
-    spn: "R&D Network"
-    spn: "T-Mobile HR"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21901"
-    mccmnc_tuple: "21920"
-    gid1: "01"
-    gid1: "02"
-    gid1: "03"
-    gid1: "99"
-    gid1: "FF"
-  }
-}
-carrier_id {
-  canonical_id: 11
-  carrier_name: "Slovak Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "23102"
-    spn: "Telekom SK"
-    spn: "Juro.sk"
-  }
-}
-carrier_id {
-  canonical_id: 12
-  carrier_name: "T-Mobile - UA"
-  carrier_attribute {
-    mccmnc_tuple: "25502"
-  }
-}
-carrier_id {
-  canonical_id: 13
-  carrier_name: "Mkedonski Telecom AD Skopje"
-  carrier_attribute {
-    mccmnc_tuple: "29401"
-    spn: "T-Mobile MK"
-    spn: "Telekom.mk"
-    spn: "Telekom MK"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "29401"
-    gid1: "FF"
-  }
-}
-carrier_id {
-  canonical_id: 14
-  carrier_name: "A1"
-  carrier_attribute {
-    mccmnc_tuple: "23201"
-    mccmnc_tuple: "23202"
-    mccmnc_tuple: "23209"
-    mccmnc_tuple: "23211"
-    mccmnc_tuple: "23212"
-    spn: ""
-  }
-}
-carrier_id {
-  canonical_id: 15
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "50503"
-  }
-}
-carrier_id {
-  canonical_id: 16
-  carrier_name: "Swisscom"
-  carrier_attribute {
-    mccmnc_tuple: "22801"
-    spn: "Swisscom"
-  }
-}
-carrier_id {
-  canonical_id: 18
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "20205"
-    spn: "vodafone GR"
-    spn: "CU"
-    spn: "CU-X"
-  }
-}
-carrier_id {
-  canonical_id: 19
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "27201"
-    spn: "vodafone IE"
-    spn: "Vodafone IE"
-  }
-}
-carrier_id {
-  canonical_id: 20
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    imsi_prefix_xpattern: "204040"
-    imsi_prefix_xpattern: "204041"
-    imsi_prefix_xpattern: "204042"
-    imsi_prefix_xpattern: "204044"
-    imsi_prefix_xpattern: "204045"
-    imsi_prefix_xpattern: "204047"
-    imsi_prefix_xpattern: "204048"
-    imsi_prefix_xpattern: "204049"
-    spn: ""
-    spn: "vodafone NL"
-    spn: "Vodafone"
-  }
-}
-carrier_id {
-  canonical_id: 21
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "53001"
-    spn: "vodafone NZ"
-  }
-}
-carrier_id {
-  canonical_id: 22
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "26801"
-    mccmnc_tuple: "26891"
-    mccmnc_tuple: "26892"
-    spn: ""
-    spn: "vodafone P"
-    spn: "Vodafone"
-  }
-}
-carrier_id {
-  canonical_id: 23
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "22601"
-    spn: "Vodafone RO"
-  }
-}
-carrier_id {
-  canonical_id: 24
-  carrier_name: "Vodacom"
-  carrier_attribute {
-    mccmnc_tuple: "65501"
-  }
-}
-carrier_id {
-  canonical_id: 25
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "26202"
-    imsi_prefix_xpattern: "262020"
-    imsi_prefix_xpattern: "2620211"
-    imsi_prefix_xpattern: "2620212"
-    imsi_prefix_xpattern: "2620213"
-    imsi_prefix_xpattern: "2620214"
-    imsi_prefix_xpattern: "2620215"
-    imsi_prefix_xpattern: "2620216"
-    imsi_prefix_xpattern: "2620217"
-    imsi_prefix_xpattern: "2620218"
-    imsi_prefix_xpattern: "26202190"
-    imsi_prefix_xpattern: "262021910"
-    imsi_prefix_xpattern: "262021911"
-    imsi_prefix_xpattern: "262021912"
-    imsi_prefix_xpattern: "2620219130"
-    imsi_prefix_xpattern: "2620219131"
-    imsi_prefix_xpattern: "2620219132"
-    imsi_prefix_xpattern: "2620219133"
-    imsi_prefix_xpattern: "2620219134"
-    imsi_prefix_xpattern: "2620219141"
-    imsi_prefix_xpattern: "2620219142"
-    imsi_prefix_xpattern: "2620219143"
-    imsi_prefix_xpattern: "2620219144"
-    imsi_prefix_xpattern: "2620219149"
-    imsi_prefix_xpattern: "262021915"
-    imsi_prefix_xpattern: "262021916"
-    imsi_prefix_xpattern: "262021917"
-    imsi_prefix_xpattern: "262021918"
-    imsi_prefix_xpattern: "262021919"
-    imsi_prefix_xpattern: "26202192"
-    imsi_prefix_xpattern: "26202193"
-    imsi_prefix_xpattern: "26202194"
-    imsi_prefix_xpattern: "26202195"
-    imsi_prefix_xpattern: "26202196"
-    imsi_prefix_xpattern: "26202197"
-    imsi_prefix_xpattern: "26202198"
-    imsi_prefix_xpattern: "26202199"
-    imsi_prefix_xpattern: "262022"
-    imsi_prefix_xpattern: "262023"
-    imsi_prefix_xpattern: "262024"
-    imsi_prefix_xpattern: "262025"
-    imsi_prefix_xpattern: "262026"
-    imsi_prefix_xpattern: "262027"
-    imsi_prefix_xpattern: "262028"
-    imsi_prefix_xpattern: "262029"
-    spn: ""
-    spn: "Vodafone"
-    spn: "Vodafone.de"
-    spn: "vodafone.de"
-  }
-}
-carrier_id {
-  canonical_id: 26
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "21401"
-    spn: ""
-    spn: "vodafone"
-    spn: "vodafone ES"
-    spn: "Vodafone"
-    spn: "Personal"
-    spn: "Profesional"
-  }
-}
-carrier_id {
-  canonical_id: 27
-  carrier_name: "SFR"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "20810"
-    mccmnc_tuple: "20811"
-    mccmnc_tuple: "20813"
-  }
-}
-carrier_id {
-  canonical_id: 28
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "23415"
-    mccmnc_tuple: "23491"
-    spn: ""
-    spn: "Vodafone"
-    spn: "vodafone UK"
-  }
-}
-carrier_id {
-  canonical_id: 29
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "22210"
-    spn: ""
-    spn: "vodafone IT"
-    spn: "Vodafone"
-  }
-}
-carrier_id {
-  canonical_id: 30
-  carrier_name: "Optus"
-  carrier_attribute {
-    mccmnc_tuple: "50502"
-    mccmnc_tuple: "50590"
-  }
-}
-carrier_id {
-  canonical_id: 31
-  carrier_name: "Singtel"
-  carrier_attribute {
-    mccmnc_tuple: "52501"
-    mccmnc_tuple: "52502"
-  }
-}
-carrier_id {
-  canonical_id: 32
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "20800"
-    mccmnc_tuple: "20801"
-    mccmnc_tuple: "20802"
-    spn: "Orange F"
-  }
-}
-carrier_id {
-  canonical_id: 33
-  carrier_name: "TIM"
-  carrier_attribute {
-    mccmnc_tuple: "22201"
-  }
-}
-carrier_id {
-  canonical_id: 34
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    mccmnc_tuple: "21407"
-  }
-}
-carrier_id {
-  canonical_id: 450
-  carrier_name: "Mobiland"
-  carrier_attribute {
-    mccmnc_tuple: "21303"
-  }
-}
-carrier_id {
-  canonical_id: 451
-  carrier_name: "Etisalat"
-  carrier_attribute {
-    mccmnc_tuple: "42402"
-  }
-}
-carrier_id {
-  canonical_id: 452
-  carrier_name: "AWCC"
-  carrier_attribute {
-    mccmnc_tuple: "41201"
-  }
-}
-carrier_id {
-  canonical_id: 453
-  carrier_name: "Roshan"
-  carrier_attribute {
-    mccmnc_tuple: "41220"
-  }
-}
-carrier_id {
-  canonical_id: 454
-  carrier_name: "New1"
-  carrier_attribute {
-    mccmnc_tuple: "41230"
-  }
-}
-carrier_id {
-  canonical_id: 455
-  carrier_name: "Areeba Afghanistan"
-  carrier_attribute {
-    mccmnc_tuple: "41240"
-  }
-}
-carrier_id {
-  canonical_id: 456
-  carrier_name: "Afghan Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "41288"
-  }
-}
-carrier_id {
-  canonical_id: 457
-  carrier_name: "APUA PCS"
-  carrier_attribute {
-    mccmnc_tuple: "344030"
-  }
-}
-carrier_id {
-  canonical_id: 491
-  carrier_name: "Advanced Communications Technologies Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50524"
-  }
-}
-carrier_id {
-  canonical_id: 492
-  carrier_name: "Localstar Holding Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50588"
-  }
-}
-carrier_id {
-  canonical_id: 493
-  carrier_name: "Setar GSM"
-  carrier_attribute {
-    mccmnc_tuple: "36301"
-  }
-}
-carrier_id {
-  canonical_id: 495
-  carrier_name: "Bakcell Limited Liabil ity Company"
-  carrier_attribute {
-    mccmnc_tuple: "40002"
-  }
-}
-carrier_id {
-  canonical_id: 529
-  carrier_name: "Claro BR"
-  carrier_attribute {
-    mccmnc_tuple: "72405"
-    mccmnc_tuple: "72438"
-  }
-}
-carrier_id {
-  canonical_id: 530
-  carrier_name: "Vivo"
-  carrier_attribute {
-    mccmnc_tuple: "72406"
-    mccmnc_tuple: "72410"
-    mccmnc_tuple: "72411"
-    mccmnc_tuple: "72423"
-  }
-}
-carrier_id {
-  canonical_id: 532
-  carrier_name: "Maxitel MG"
-  carrier_attribute {
-    mccmnc_tuple: "72408"
-  }
-}
-carrier_id {
-  canonical_id: 533
-  carrier_name: "Telepar Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72409"
-  }
-}
-carrier_id {
-  canonical_id: 536
-  carrier_name: "Americel"
-  carrier_attribute {
-    mccmnc_tuple: "72412"
-  }
-}
-carrier_id {
-  canonical_id: 537
-  carrier_name: "Telesp Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72413"
-  }
-}
-carrier_id {
-  canonical_id: 538
-  carrier_name: "Maxitel BA"
-  carrier_attribute {
-    mccmnc_tuple: "72414"
-  }
-}
-carrier_id {
-  canonical_id: 539
-  carrier_name: "Sercomtel"
-  carrier_attribute {
-    mccmnc_tuple: "72415"
-  }
-}
-carrier_id {
-  canonical_id: 540
-  carrier_name: "Brasil Telecom GSM"
-  carrier_attribute {
-    mccmnc_tuple: "72416"
-  }
-}
-carrier_id {
-  canonical_id: 541
-  carrier_name: "Ceterp Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72417"
-  }
-}
-carrier_id {
-  canonical_id: 542
-  carrier_name: "Datora"
-  carrier_attribute {
-    mccmnc_tuple: "72418"
-  }
-}
-carrier_id {
-  canonical_id: 543
-  carrier_name: "Telemig Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72419"
-  }
-}
-carrier_id {
-  canonical_id: 544
-  carrier_name: "Telerj Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72421"
-  }
-}
-carrier_id {
-  canonical_id: 546
-  carrier_name: "Telebrasilia Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72425"
-  }
-}
-carrier_id {
-  canonical_id: 547
-  carrier_name: "Telegoias Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72427"
-  }
-}
-carrier_id {
-  canonical_id: 548
-  carrier_name: "Unifique"
-  carrier_attribute {
-    mccmnc_tuple: "72429"
-  }
-}
-carrier_id {
-  canonical_id: 562
-  carrier_name: "Teleamapa Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72457"
-  }
-}
-carrier_id {
-  canonical_id: 563
-  carrier_name: "Telaima Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72459"
-  }
-}
-carrier_id {
-  canonical_id: 564
-  carrier_name: "Bhutan Telecom Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "40211"
-  }
-}
-carrier_id {
-  canonical_id: 566
-  carrier_name: "Mascom Wireless (Pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65201"
-  }
-}
-carrier_id {
-  canonical_id: 567
-  carrier_name: "Orange Botswana (Pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65202"
-  }
-}
-carrier_id {
-  canonical_id: 568
-  carrier_name: "A1 BY"
-  carrier_attribute {
-    mccmnc_tuple: "25701"
-  }
-}
-carrier_id {
-  canonical_id: 569
-  carrier_name: "MTS"
-  carrier_attribute {
-    mccmnc_tuple: "25702"
-  }
-}
-carrier_id {
-  canonical_id: 570
-  carrier_name: "Belize Telecommunications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "70267"
-  }
-}
-carrier_id {
-  canonical_id: 571
-  carrier_name: "International Telecommunications Ltd. (INTELCO)"
-  carrier_attribute {
-    mccmnc_tuple: "70268"
-  }
-}
-carrier_id {
-  canonical_id: 572
-  carrier_name: "Clearnet"
-  carrier_attribute {
-    mccmnc_tuple: "30236"
-  }
-}
-carrier_id {
-  canonical_id: 574
-  carrier_name: "Ice Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "30262"
-  }
-}
-carrier_id {
-  canonical_id: 575
-  carrier_name: "Aliant Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "30263"
-  }
-}
-carrier_id {
-  canonical_id: 576
-  carrier_name: "Bell Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302690"
-    gid1: "41"
-    gid1: "43"
-  }
-}
-carrier_id {
-  canonical_id: 577
-  carrier_name: "Tbay Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "302656"
-  }
-}
-carrier_id {
-  canonical_id: 578
-  carrier_name: "MTS Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "302660"
-    mccmnc_tuple: "302370"
-    gid1: "2c"
-    gid1: "4d"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302660"
-    spn: "MTS"
-  }
-}
-carrier_id {
-  canonical_id: 579
-  carrier_name: "CityTel Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "30267"
-  }
-}
-carrier_id {
-  canonical_id: 580
-  carrier_name: "Sask Tel Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "30268"
-    mccmnc_tuple: "302654"
-    mccmnc_tuple: "302680"
-    mccmnc_tuple: "302780"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    gid1: "5a"
-  }
-}
-carrier_id {
-  canonical_id: 581
-  carrier_name: "Globalstar"
-  carrier_attribute {
-    mccmnc_tuple: "30271"
-  }
-}
-carrier_id {
-  canonical_id: 624
-  carrier_name: "Colombia Móvil S.A."
-  carrier_attribute {
-    mccmnc_tuple: "732103"
-    mccmnc_tuple: "732111"
-  }
-}
-carrier_id {
-  canonical_id: 625
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "732123"
-  }
-}
-carrier_id {
-  canonical_id: 626
-  carrier_name: "WOM"
-  carrier_attribute {
-    mccmnc_tuple: "732130"
-    mccmnc_tuple: "732360"
-  }
-}
-carrier_id {
-  canonical_id: 627
-  carrier_name: "KOLBI ICE"
-  carrier_attribute {
-    mccmnc_tuple: "71201"
-    mccmnc_tuple: "71202"
-  }
-}
-carrier_id {
-  canonical_id: 655
-  carrier_name: "Barablu Mobile Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "23807"
-  }
-}
-carrier_id {
-  canonical_id: 656
-  carrier_name: "Telia"
-  carrier_attribute {
-    mccmnc_tuple: "23820"
-    mccmnc_tuple: "23830"
-  }
-}
-carrier_id {
-  canonical_id: 657
-  carrier_name: "Tele2"
-  carrier_attribute {
-    mccmnc_tuple: "23877"
-  }
-}
-carrier_id {
-  canonical_id: 658
-  carrier_name: "Altice Dominicana"
-  carrier_attribute {
-    mccmnc_tuple: "37001"
-  }
-}
-carrier_id {
-  canonical_id: 667
-  carrier_name: "Telia"
-  carrier_attribute {
-    mccmnc_tuple: "24801"
-  }
-}
-carrier_id {
-  canonical_id: 668
-  carrier_name: "Elisa"
-  carrier_attribute {
-    mccmnc_tuple: "24802"
-  }
-}
-carrier_id {
-  canonical_id: 669
-  carrier_name: "Tele2"
-  carrier_attribute {
-    mccmnc_tuple: "24803"
-  }
-}
-carrier_id {
-  canonical_id: 670
-  carrier_name: "OY Top Connect"
-  carrier_attribute {
-    mccmnc_tuple: "24804"
-  }
-}
-carrier_id {
-  canonical_id: 671
-  carrier_name: "AS Bravocom Mobiil"
-  carrier_attribute {
-    mccmnc_tuple: "24805"
-  }
-}
-carrier_id {
-  canonical_id: 672
-  carrier_name: "OY ViaTel"
-  carrier_attribute {
-    mccmnc_tuple: "24806"
-  }
-}
-carrier_id {
-  canonical_id: 673
-  carrier_name: "Televõrgu AS"
-  carrier_attribute {
-    mccmnc_tuple: "24807"
-  }
-}
-carrier_id {
-  canonical_id: 674
-  carrier_name: "Siseministeerium (Ministry of Interior)"
-  carrier_attribute {
-    mccmnc_tuple: "24871"
-  }
-}
-carrier_id {
-  canonical_id: 675
-  carrier_name: "Orange Egypt"
-  carrier_attribute {
-    mccmnc_tuple: "60201"
-  }
-}
-carrier_id {
-  canonical_id: 676
-  carrier_name: "Vodafone Egypt"
-  carrier_attribute {
-    mccmnc_tuple: "60202"
-    spn: "vodafone"
-  }
-}
-carrier_id {
-  canonical_id: 678
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "Orange"
-  }
-}
-carrier_id {
-  canonical_id: 679
-  carrier_name: "Yoigo"
-  carrier_attribute {
-    mccmnc_tuple: "21404"
-    spn: "Yoigo"
-    spn: "Pepephone"
-    spn: "MASMOVIL"
-    spn: "LLAMAYA"
-    spn: "Guuk"
-    spn: "Cablemovil"
-    spn: "Sweno"
-    spn: "Lebara"
-    spn: "Lycamobile"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21404"
-    imsi_prefix_xpattern: "2140423"
-    spn: "EUSKALTEL"
-    spn: "RACC"
-    spn: "mobilR"
-    spn: "Virgin telco"
-    spn: "telecable"
-  }
-}
-carrier_id {
-  canonical_id: 681
-  carrier_name: "ETH MTN"
-  carrier_attribute {
-    mccmnc_tuple: "63601"
-  }
-}
-carrier_id {
-  canonical_id: 682
-  carrier_name: "Finnet Networks Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "24404"
-  }
-}
-carrier_id {
-  canonical_id: 717
-  carrier_name: "Virgin"
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    mccmnc_tuple: "23433"
-    mccmnc_tuple: "23438"
-    gid1: "2800000000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    gid1: "2800000000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20620"
-    gid1: "2800000000000000"
-  }
-}
-carrier_id {
-  canonical_id: 718
-  carrier_name: "EE"
-  carrier_attribute {
-    mccmnc_tuple: "23431"
-    mccmnc_tuple: "23432"
-    mccmnc_tuple: "23430"
-    mccmnc_tuple: "23433"
-    mccmnc_tuple: "23486"
-  }
-}
-carrier_id {
-  canonical_id: 720
-  carrier_name: "Cable and Wireless Guensey Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23455"
-  }
-}
-carrier_id {
-  canonical_id: 733
-  carrier_name: "Gibtelecom GSM"
-  carrier_attribute {
-    mccmnc_tuple: "26601"
-  }
-}
-carrier_id {
-  canonical_id: 734
-  carrier_name: "Cloud9 Mobile Communications"
-  carrier_attribute {
-    mccmnc_tuple: "26609"
-  }
-}
-carrier_id {
-  canonical_id: 735
-  carrier_name: "Tele Greenland"
-  carrier_attribute {
-    mccmnc_tuple: "29001"
-  }
-}
-carrier_id {
-  canonical_id: 736
-  carrier_name: "Gamcel"
-  carrier_attribute {
-    mccmnc_tuple: "60701"
-  }
-}
-carrier_id {
-  canonical_id: 737
-  carrier_name: "Africell"
-  carrier_attribute {
-    mccmnc_tuple: "60702"
-  }
-}
-carrier_id {
-  canonical_id: 738
-  carrier_name: "Comium Services Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "60703"
-  }
-}
-carrier_id {
-  canonical_id: 739
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "61101"
-  }
-}
-carrier_id {
-  canonical_id: 740
-  carrier_name: "Sotelgui"
-  carrier_attribute {
-    mccmnc_tuple: "61102"
-  }
-}
-carrier_id {
-  canonical_id: 741
-  carrier_name: "Cellcom Guinée SA"
-  carrier_attribute {
-    mccmnc_tuple: "61105"
-  }
-}
-carrier_id {
-  canonical_id: 742
-  carrier_name: "Orange Caraïbe Mobiles"
-  carrier_attribute {
-    mccmnc_tuple: "34001"
-  }
-}
-carrier_id {
-  canonical_id: 743
-  carrier_name: "Outremer Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "34002"
-  }
-}
-carrier_id {
-  canonical_id: 744
-  carrier_name: "Saint Martin et Saint Barthelemy Telcell Sarl"
-  carrier_attribute {
-    mccmnc_tuple: "34003"
-  }
-}
-carrier_id {
-  canonical_id: 745
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "34020"
-  }
-}
-carrier_id {
-  canonical_id: 746
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "62701"
-  }
-}
-carrier_id {
-  canonical_id: 747
-  carrier_name: "COSMOTE"
-  carrier_attribute {
-    mccmnc_tuple: "20201"
-    gid1: "FFFF"
-    gid1: "FF"
-  }
-}
-carrier_id {
-  canonical_id: 749
-  carrier_name: "Info Quest S.A."
-  carrier_attribute {
-    mccmnc_tuple: "20209"
-  }
-}
-carrier_id {
-  canonical_id: 759
-  carrier_name: "3G Radio System/HKCSL3G"
-  carrier_attribute {
-    mccmnc_tuple: "45402"
-  }
-}
-carrier_id {
-  canonical_id: 760
-  carrier_name: "Hutchison HK"
-  carrier_attribute {
-    mccmnc_tuple: "45403"
-  }
-}
-carrier_id {
-  canonical_id: 761
-  carrier_name: "SmarTone HK"
-  carrier_attribute {
-    mccmnc_tuple: "45406"
-    mccmnc_tuple: "45417"
-    mccmnc_tuple: "45415"
-  }
-}
-carrier_id {
-  canonical_id: 762
-  carrier_name: "MVNO/China Unicom International Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "45407"
-  }
-}
-carrier_id {
-  canonical_id: 763
-  carrier_name: "MVNO/Trident"
-  carrier_attribute {
-    mccmnc_tuple: "45408"
-  }
-}
-carrier_id {
-  canonical_id: 764
-  carrier_name: "MVNO/China Motion Telecom (HK) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "45409"
-  }
-}
-carrier_id {
-  canonical_id: 765
-  carrier_name: "GSM1800New World PCS Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "45410"
-  }
-}
-carrier_id {
-  canonical_id: 766
-  carrier_name: "MVNO/CHKTL"
-  carrier_attribute {
-    mccmnc_tuple: "45411"
-  }
-}
-carrier_id {
-  canonical_id: 767
-  carrier_name: "中國移動香港 China Mobile HK"
-  carrier_attribute {
-    mccmnc_tuple: "45412"
-    mccmnc_tuple: "45413"
-  }
-}
-carrier_id {
-  canonical_id: 769
-  carrier_name: "PCCW"
-  carrier_attribute {
-    mccmnc_tuple: "45416"
-  }
-}
-carrier_id {
-  canonical_id: 770
-  carrier_name: "GSM7800/Hong Kong CSL Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "45418"
-  }
-}
-carrier_id {
-  canonical_id: 772
-  carrier_name: "Public Mobile Networks/Reserved"
-  carrier_attribute {
-    mccmnc_tuple: "45420"
-    mccmnc_tuple: "45421"
-    mccmnc_tuple: "45422"
-    mccmnc_tuple: "45423"
-    mccmnc_tuple: "45424"
-    mccmnc_tuple: "45425"
-    mccmnc_tuple: "45426"
-    mccmnc_tuple: "45427"
-    mccmnc_tuple: "45428"
-    mccmnc_tuple: "45429"
-    mccmnc_tuple: "45430"
-    mccmnc_tuple: "45431"
-    mccmnc_tuple: "45432"
-    mccmnc_tuple: "45433"
-    mccmnc_tuple: "45434"
-    mccmnc_tuple: "45435"
-    mccmnc_tuple: "45436"
-    mccmnc_tuple: "45437"
-    mccmnc_tuple: "45438"
-    mccmnc_tuple: "45439"
-  }
-}
-carrier_id {
-  canonical_id: 773
-  carrier_name: "Claro HN"
-  carrier_attribute {
-    mccmnc_tuple: "708001"
-    mccmnc_tuple: "70801"
-  }
-}
-carrier_id {
-  canonical_id: 787
-  carrier_name: "Telkomsel"
-  carrier_attribute {
-    mccmnc_tuple: "51010"
-  }
-}
-carrier_id {
-  canonical_id: 788
-  carrier_name: "XL/AXIS"
-  carrier_attribute {
-    mccmnc_tuple: "51008"
-    mccmnc_tuple: "51011"
-  }
-}
-carrier_id {
-  canonical_id: 789
-  carrier_name: "Indosat - M3"
-  carrier_attribute {
-    mccmnc_tuple: "51021"
-  }
-}
-carrier_id {
-  canonical_id: 792
-  carrier_name: "3"
-  carrier_attribute {
-    mccmnc_tuple: "27202"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "27211"
-    imsi_prefix_xpattern: "272110200677368"
-  }
-}
-carrier_id {
-  canonical_id: 793
-  carrier_name: "Meteor Mobile Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "27203"
-  }
-}
-carrier_id {
-  canonical_id: 794
-  carrier_name: "Eircom"
-  carrier_attribute {
-    mccmnc_tuple: "27207"
-  }
-}
-carrier_id {
-  canonical_id: 795
-  carrier_name: "Clever Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "27209"
-  }
-}
-carrier_id {
-  canonical_id: 796
-  carrier_name: "Partner Communications Co. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "42501"
-    mccmnc_tuple: "42510"
-  }
-}
-carrier_id {
-  canonical_id: 797
-  carrier_name: "Cellcom Israel Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "42502"
-  }
-}
-carrier_id {
-  canonical_id: 798
-  carrier_name: "Pelephone Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "42503"
-  }
-}
-carrier_id {
-  canonical_id: 802
-  carrier_name: "Vi"
-  carrier_attribute {
-    mccmnc_tuple: "40404"
-    mccmnc_tuple: "40407"
-    mccmnc_tuple: "40412"
-    mccmnc_tuple: "40414"
-    mccmnc_tuple: "40419"
-    mccmnc_tuple: "40422"
-    mccmnc_tuple: "40424"
-    mccmnc_tuple: "40444"
-    mccmnc_tuple: "40456"
-    mccmnc_tuple: "40478"
-    mccmnc_tuple: "40482"
-    mccmnc_tuple: "40487"
-    mccmnc_tuple: "40489"
-    mccmnc_tuple: "40570"
-    mccmnc_tuple: "40545"
-    mccmnc_tuple: "405799"
-    mccmnc_tuple: "405845"
-    mccmnc_tuple: "405846"
-    mccmnc_tuple: "405847"
-    mccmnc_tuple: "405848"
-    mccmnc_tuple: "405849"
-    mccmnc_tuple: "405850"
-    mccmnc_tuple: "405851"
-    mccmnc_tuple: "405852"
-    mccmnc_tuple: "405853"
-    mccmnc_tuple: "405908"
-    mccmnc_tuple: "405909"
-    mccmnc_tuple: "405910"
-    mccmnc_tuple: "405911"
-  }
-}
-carrier_id {
-  canonical_id: 849
-  carrier_name: "Orange Jordan"
-  carrier_attribute {
-    mccmnc_tuple: "41677"
-    mccmnc_tuple: "416770"
-  }
-}
-carrier_id {
-  canonical_id: 850
-  carrier_name: "NTT DOCOMO"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    gid1: "00FFFF"
-    gid1: "01FFFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "spmode.ne.jp"
-    preferred_apn: "mopera.net"
-  }
-}
-carrier_id {
-  canonical_id: 865
-  carrier_name: "Safaricom"
-  carrier_attribute {
-    mccmnc_tuple: "63902"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "63902"
-    spn: "Safaricom"
-  }
-}
-carrier_id {
-  canonical_id: 866
-  carrier_name: "Airtel Kenya"
-  carrier_attribute {
-    mccmnc_tuple: "63903"
-  }
-}
-carrier_id {
-  canonical_id: 867
-  carrier_name: "Beeline"
-  carrier_attribute {
-    mccmnc_tuple: "43701"
-  }
-}
-carrier_id {
-  canonical_id: 868
-  carrier_name: "Mobitel (Cam GSM)"
-  carrier_attribute {
-    mccmnc_tuple: "45601"
-  }
-}
-carrier_id {
-  canonical_id: 869
-  carrier_name: "Smart"
-  carrier_attribute {
-    mccmnc_tuple: "45602"
-    mccmnc_tuple: "45605"
-    mccmnc_tuple: "45606"
-  }
-}
-carrier_id {
-  canonical_id: 870
-  carrier_name: "S Telecom (CDMA) (reserved)"
-  carrier_attribute {
-    mccmnc_tuple: "45603"
-  }
-}
-carrier_id {
-  canonical_id: 871
-  carrier_name: "Camshin (Shinawatra)"
-  carrier_attribute {
-    mccmnc_tuple: "45618"
-  }
-}
-carrier_id {
-  canonical_id: 872
-  carrier_name: "HURI - SNPT"
-  carrier_attribute {
-    mccmnc_tuple: "65401"
-  }
-}
-carrier_id {
-  canonical_id: 892
-  carrier_name: "Telia"
-  carrier_attribute {
-    mccmnc_tuple: "24601"
-  }
-}
-carrier_id {
-  canonical_id: 893
-  carrier_name: "BITĖ"
-  carrier_attribute {
-    mccmnc_tuple: "24602"
-  }
-}
-carrier_id {
-  canonical_id: 894
-  carrier_name: "Tele2"
-  carrier_attribute {
-    mccmnc_tuple: "24603"
-  }
-}
-carrier_id {
-  canonical_id: 895
-  carrier_name: "P&T Luxembourg"
-  carrier_attribute {
-    mccmnc_tuple: "27001"
-  }
-}
-carrier_id {
-  canonical_id: 896
-  carrier_name: "Tango"
-  carrier_attribute {
-    mccmnc_tuple: "27077"
-  }
-}
-carrier_id {
-  canonical_id: 897
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "27099"
-  }
-}
-carrier_id {
-  canonical_id: 898
-  carrier_name: "LMT"
-  carrier_attribute {
-    mccmnc_tuple: "24701"
-  }
-}
-carrier_id {
-  canonical_id: 899
-  carrier_name: "Tele2/ZZ"
-  carrier_attribute {
-    mccmnc_tuple: "24702"
-  }
-}
-carrier_id {
-  canonical_id: 900
-  carrier_name: "Telekom Baltija"
-  carrier_attribute {
-    mccmnc_tuple: "24703"
-  }
-}
-carrier_id {
-  canonical_id: 901
-  carrier_name: "Beta Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "24704"
-  }
-}
-carrier_id {
-  canonical_id: 902
-  carrier_name: "Méditélécom"
-  carrier_attribute {
-    mccmnc_tuple: "60400"
-  }
-}
-carrier_id {
-  canonical_id: 903
-  carrier_name: "Maroc"
-  carrier_attribute {
-    mccmnc_tuple: "60401"
-  }
-}
-carrier_id {
-  canonical_id: 904
-  carrier_name: "Orange Moldova GSM"
-  carrier_attribute {
-    mccmnc_tuple: "25901"
-  }
-}
-carrier_id {
-  canonical_id: 905
-  carrier_name: "Moldcell GSM"
-  carrier_attribute {
-    mccmnc_tuple: "25902"
-  }
-}
-carrier_id {
-  canonical_id: 906
-  carrier_name: "Eventis Mobile GSM"
-  carrier_attribute {
-    mccmnc_tuple: "25904"
-  }
-}
-carrier_id {
-  canonical_id: 941
-  carrier_name: "Mobile Telecommunications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "64901"
-  }
-}
-carrier_id {
-  canonical_id: 942
-  carrier_name: "Powercom Pty Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "64903"
-  }
-}
-carrier_id {
-  canonical_id: 943
-  carrier_name: "OPT Mobilis"
-  carrier_attribute {
-    mccmnc_tuple: "54601"
-  }
-}
-carrier_id {
-  canonical_id: 945
-  carrier_name: "Airtel Niger"
-  carrier_attribute {
-    mccmnc_tuple: "61402"
-  }
-}
-carrier_id {
-  canonical_id: 958
-  carrier_name: "Telenor"
-  carrier_attribute {
-    mccmnc_tuple: "24201"
-    mccmnc_tuple: "24212"
-  }
-}
-carrier_id {
-  canonical_id: 959
-  carrier_name: "Telia"
-  carrier_attribute {
-    mccmnc_tuple: "24202"
-  }
-}
-carrier_id {
-  canonical_id: 960
-  carrier_name: "Teletopia Mobile Communications AS"
-  carrier_attribute {
-    mccmnc_tuple: "24203"
-  }
-}
-carrier_id {
-  canonical_id: 961
-  carrier_name: "Tele2 Norge AS"
-  carrier_attribute {
-    mccmnc_tuple: "24204"
-  }
-}
-carrier_id {
-  canonical_id: 962
-  carrier_name: "Nepal Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "42901"
-    mccmnc_tuple: "42903"
-  }
-}
-carrier_id {
-  canonical_id: 963
-  carrier_name: "Reserved for AMPS MIN based IMSI's"
-  carrier_attribute {
-    mccmnc_tuple: "53000"
-  }
-}
-carrier_id {
-  canonical_id: 965
-  carrier_name: "Teleom New Zealand CDMA Network"
-  carrier_attribute {
-    mccmnc_tuple: "53002"
-  }
-}
-carrier_id {
-  canonical_id: 966
-  carrier_name: "Woosh Wireless - CDMA Network"
-  carrier_attribute {
-    mccmnc_tuple: "53003"
-  }
-}
-carrier_id {
-  canonical_id: 968
-  carrier_name: "Spark"
-  carrier_attribute {
-    mccmnc_tuple: "53005"
-  }
-}
-carrier_id {
-  canonical_id: 969
-  carrier_name: "2degrees"
-  carrier_attribute {
-    mccmnc_tuple: "53024"
-  }
-}
-carrier_id {
-  canonical_id: 970
-  carrier_name: "Omantel"
-  carrier_attribute {
-    mccmnc_tuple: "42202"
-    mccmnc_tuple: "42204"
-  }
-}
-carrier_id {
-  canonical_id: 971
-  carrier_name: "Ooredoo"
-  carrier_attribute {
-    mccmnc_tuple: "42203"
-  }
-}
-carrier_id {
-  canonical_id: 973
-  carrier_name: "Cable & Wireless Panama S.A."
-  carrier_attribute {
-    mccmnc_tuple: "71401"
-  }
-}
-carrier_id {
-  canonical_id: 974
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "71402"
-    mccmnc_tuple: "714020"
-  }
-}
-carrier_id {
-  canonical_id: 1008
-  carrier_name: "Société Réunionnaise du Radiotéléphone"
-  carrier_attribute {
-    mccmnc_tuple: "64710"
-  }
-}
-carrier_id {
-  canonical_id: 1010
-  carrier_name: "Telekom Romania"
-  carrier_attribute {
-    mccmnc_tuple: "22603"
-    mccmnc_tuple: "22606"
-    spn: "TELEKOM.RO"
-    spn: "COSMOTE"
-    spn: "frog"
-    spn: "MTV Mobile"
-  }
-}
-carrier_id {
-  canonical_id: 1011
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "22610"
-  }
-}
-carrier_id {
-  canonical_id: 1012
-  carrier_name: "Yettel"
-  carrier_attribute {
-    mccmnc_tuple: "22001"
-    mccmnc_tuple: "22002"
-  }
-}
-carrier_id {
-  canonical_id: 1013
-  carrier_name: "Telekom Srbija a.d."
-  carrier_attribute {
-    mccmnc_tuple: "22003"
-  }
-}
-carrier_id {
-  canonical_id: 1014
-  carrier_name: "Vip mobile d.o.o."
-  carrier_attribute {
-    mccmnc_tuple: "22005"
-  }
-}
-carrier_id {
-  canonical_id: 1016
-  carrier_name: "MegaFon"
-  carrier_attribute {
-    mccmnc_tuple: "25002"
-  }
-}
-carrier_id {
-  canonical_id: 1018
-  carrier_name: "Sibchallenge"
-  carrier_attribute {
-    mccmnc_tuple: "25004"
-  }
-}
-carrier_id {
-  canonical_id: 1020
-  carrier_name: "BM Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "25007"
-  }
-}
-carrier_id {
-  canonical_id: 1021
-  carrier_name: "Don Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "25010"
-  }
-}
-carrier_id {
-  canonical_id: 1022
-  carrier_name: "Orensot"
-  carrier_attribute {
-    mccmnc_tuple: "25011"
-  }
-}
-carrier_id {
-  canonical_id: 1024
-  carrier_name: "Kuban GSM"
-  carrier_attribute {
-    mccmnc_tuple: "25013"
-  }
-}
-carrier_id {
-  canonical_id: 1025
-  carrier_name: "New Telephone Company"
-  carrier_attribute {
-    mccmnc_tuple: "25016"
-  }
-}
-carrier_id {
-  canonical_id: 1027
-  carrier_name: "Volgograd Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "25019"
-  }
-}
-carrier_id {
-  canonical_id: 1028
-  carrier_name: "Tele2"
-  carrier_attribute {
-    mccmnc_tuple: "25003"
-    mccmnc_tuple: "25005"
-    mccmnc_tuple: "25012"
-    mccmnc_tuple: "25017"
-    mccmnc_tuple: "25020"
-    mccmnc_tuple: "25039"
-  }
-}
-carrier_id {
-  canonical_id: 1029
-  carrier_name: "Extel"
-  carrier_attribute {
-    mccmnc_tuple: "25028"
-  }
-}
-carrier_id {
-  canonical_id: 1031
-  carrier_name: "Stuvtelesot"
-  carrier_attribute {
-    mccmnc_tuple: "25044"
-  }
-}
-carrier_id {
-  canonical_id: 1074
-  carrier_name: "Comium (Sierra Leone) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "61904"
-  }
-}
-carrier_id {
-  canonical_id: 1075
-  carrier_name: "Lintel (Sierra Leone) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "61905"
-  }
-}
-carrier_id {
-  canonical_id: 1076
-  carrier_name: "Mobitel"
-  carrier_attribute {
-    mccmnc_tuple: "61925"
-  }
-}
-carrier_id {
-  canonical_id: 1077
-  carrier_name: "Datatel (SL) Ltd GSM"
-  carrier_attribute {
-    mccmnc_tuple: "61940"
-  }
-}
-carrier_id {
-  canonical_id: 1082
-  carrier_name: "Golis Telecommunications Company"
-  carrier_attribute {
-    mccmnc_tuple: "63730"
-  }
-}
-carrier_id {
-  canonical_id: 1083
-  carrier_name: "Telesur"
-  carrier_attribute {
-    mccmnc_tuple: "74602"
-  }
-}
-carrier_id {
-  canonical_id: 1084
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "74603"
-  }
-}
-carrier_id {
-  canonical_id: 1085
-  carrier_name: "Intelsur"
-  carrier_attribute {
-    mccmnc_tuple: "74604"
-  }
-}
-carrier_id {
-  canonical_id: 1086
-  carrier_name: "Companhia Santomese de Telecomunicaçôes"
-  carrier_attribute {
-    mccmnc_tuple: "62601"
-  }
-}
-carrier_id {
-  canonical_id: 1087
-  carrier_name: "Digicel, S.A. de C.V."
-  carrier_attribute {
-    mccmnc_tuple: "70602"
-  }
-}
-carrier_id {
-  canonical_id: 1088
-  carrier_name: "Syriatel"
-  carrier_attribute {
-    mccmnc_tuple: "41701"
-  }
-}
-carrier_id {
-  canonical_id: 1089
-  carrier_name: "Spacetel Syria"
-  carrier_attribute {
-    mccmnc_tuple: "41702"
-  }
-}
-carrier_id {
-  canonical_id: 1090
-  carrier_name: "Syrian Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "41709"
-  }
-}
-carrier_id {
-  canonical_id: 1091
-  carrier_name: "Swazi MTN"
-  carrier_attribute {
-    mccmnc_tuple: "65310"
-  }
-}
-carrier_id {
-  canonical_id: 1092
-  carrier_name: "IslandCom Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "376352"
-  }
-}
-carrier_id {
-  canonical_id: 1093
-  carrier_name: "Airtel Chad"
-  carrier_attribute {
-    mccmnc_tuple: "62201"
-  }
-}
-carrier_id {
-  canonical_id: 1094
-  carrier_name: "Tchad Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "62202"
-  }
-}
-carrier_id {
-  canonical_id: 1095
-  carrier_name: "Togo Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "61501"
-  }
-}
-carrier_id {
-  canonical_id: 1096
-  carrier_name: "CAT CDMA"
-  carrier_attribute {
-    mccmnc_tuple: "52000"
-    mccmnc_tuple: "52002"
-  }
-}
-carrier_id {
-  canonical_id: 1097
-  carrier_name: "AIS GSM"
-  carrier_attribute {
-    mccmnc_tuple: "52001"
-  }
-}
-carrier_id {
-  canonical_id: 1098
-  carrier_name: "AIS"
-  carrier_attribute {
-    mccmnc_tuple: "52003"
-  }
-}
-carrier_id {
-  canonical_id: 1136
-  carrier_name: "Iridium Satellite, LLC (GMSS)"
-  carrier_attribute {
-    mccmnc_tuple: "90103"
-  }
-}
-carrier_id {
-  canonical_id: 1137
-  carrier_name: "Globalstar"
-  carrier_attribute {
-    mccmnc_tuple: "90104"
-  }
-}
-carrier_id {
-  canonical_id: 1138
-  carrier_name: "Thuraya RMSS Network"
-  carrier_attribute {
-    mccmnc_tuple: "90105"
-  }
-}
-carrier_id {
-  canonical_id: 1139
-  carrier_name: "Thuraya Satellite Telecommunications Company"
-  carrier_attribute {
-    mccmnc_tuple: "90106"
-  }
-}
-carrier_id {
-  canonical_id: 1166
-  carrier_name: "Consolidated Telcom"
-  carrier_attribute {
-    mccmnc_tuple: "310060"
-  }
-}
-carrier_id {
-  canonical_id: 1168
-  carrier_name: "Corr Wireless Communications LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310080"
-  }
-}
-carrier_id {
-  canonical_id: 1170
-  carrier_name: "New Mexico RSA 4 East Ltd. Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "310100"
-  }
-}
-carrier_id {
-  canonical_id: 1183
-  carrier_name: "High Plains Midwest LLC, dba Wetlink Communications"
-  carrier_attribute {
-    mccmnc_tuple: "310340"
-  }
-}
-carrier_id {
-  canonical_id: 1184
-  carrier_name: "Mohave Cellular L.P."
-  carrier_attribute {
-    mccmnc_tuple: "310350"
-  }
-}
-carrier_id {
-  canonical_id: 1185
-  carrier_name: "Cellular Network Partnership dba Pioneer Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "310360"
-  }
-}
-carrier_id {
-  canonical_id: 1186
-  carrier_name: "Guamcell Cellular and Paging"
-  carrier_attribute {
-    mccmnc_tuple: "310370"
-  }
-}
-carrier_id {
-  canonical_id: 1187
-  carrier_name: "AT&T"
-  carrier_attribute {
-    mccmnc_tuple: "310030"
-    mccmnc_tuple: "310070"
-    mccmnc_tuple: "310170"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310380"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310560"
-    mccmnc_tuple: "310680"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-  }
-}
-carrier_id {
-  canonical_id: 1188
-  carrier_name: "TX-11 Acquistion LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310390"
-  }
-}
-carrier_id {
-  canonical_id: 1189
-  carrier_name: "Wave Runner LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310400"
-    mccmnc_tuple: "311250"
-  }
-}
-carrier_id {
-  canonical_id: 1190
-  carrier_name: "Cincinnati Bell Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310420"
-  }
-}
-carrier_id {
-  canonical_id: 1191
-  carrier_name: "Alaska Digitel LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310430"
-  }
-}
-carrier_id {
-  canonical_id: 1192
-  carrier_name: "Numerex Corp."
-  carrier_attribute {
-    mccmnc_tuple: "310440"
-  }
-}
-carrier_id {
-  canonical_id: 1193
-  carrier_name: "North East Cellular Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310450"
-  }
-}
-carrier_id {
-  canonical_id: 1194
-  carrier_name: "TMP Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "310460"
-  }
-}
-carrier_id {
-  canonical_id: 1195
-  carrier_name: "Choice Phone LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310480"
-    mccmnc_tuple: "311120"
-  }
-}
-carrier_id {
-  canonical_id: 1196
-  carrier_name: "Public Service Cellular, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310500"
-  }
-}
-carrier_id {
-  canonical_id: 1197
-  carrier_name: "Airtel Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310510"
-  }
-}
-carrier_id {
-  canonical_id: 1198
-  carrier_name: "VeriSign"
-  carrier_attribute {
-    mccmnc_tuple: "310520"
-  }
-}
-carrier_id {
-  canonical_id: 1199
-  carrier_name: "Oklahoma Western Telephone Company"
-  carrier_attribute {
-    mccmnc_tuple: "310540"
-  }
-}
-carrier_id {
-  canonical_id: 1234
-  carrier_name: "UBET Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-  }
-}
-carrier_id {
-  canonical_id: 1235
-  carrier_name: "Globalstar USA"
-  carrier_attribute {
-    mccmnc_tuple: "310970"
-  }
-}
-carrier_id {
-  canonical_id: 1236
-  carrier_name: "Mid-Tex Cellular Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "311000"
-  }
-}
-carrier_id {
-  canonical_id: 1237
-  carrier_name: "Chariton Valley Communications Corp., Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311010"
-  }
-}
-carrier_id {
-  canonical_id: 1238
-  carrier_name: "Missouri RSA No. 5 Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "311020"
-  }
-}
-carrier_id {
-  canonical_id: 1239
-  carrier_name: "Indigo Wireless, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311030"
-  }
-}
-carrier_id {
-  canonical_id: 1240
-  carrier_name: "Commet Wireless, LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311040"
-  }
-}
-carrier_id {
-  canonical_id: 1241
-  carrier_name: "Thumb Cellular Limited Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "311050"
-  }
-}
-carrier_id {
-  canonical_id: 1242
-  carrier_name: "Space Data Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "311060"
-  }
-}
-carrier_id {
-  canonical_id: 1243
-  carrier_name: "Easterbrooke Cellular Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "311070"
-  }
-}
-carrier_id {
-  canonical_id: 1244
-  carrier_name: "Pine Telephone Company dba Pine Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "311080"
-  }
-}
-carrier_id {
-  canonical_id: 1245
-  carrier_name: "Siouxland PCS"
-  carrier_attribute {
-    mccmnc_tuple: "311090"
-  }
-}
-carrier_id {
-  canonical_id: 1246
-  carrier_name: "Alltel Communications Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311110"
-    mccmnc_tuple: "311271"
-    mccmnc_tuple: "311272"
-    mccmnc_tuple: "311273"
-    mccmnc_tuple: "311274"
-    mccmnc_tuple: "311275"
-    mccmnc_tuple: "311276"
-    mccmnc_tuple: "311277"
-    mccmnc_tuple: "311278"
-    mccmnc_tuple: "311279"
-  }
-}
-carrier_id {
-  canonical_id: 1247
-  carrier_name: "MBO Wireless Inc./Cross Telephone Company"
-  carrier_attribute {
-    mccmnc_tuple: "311140"
-  }
-}
-carrier_id {
-  canonical_id: 1248
-  carrier_name: "Wilkes Cellular Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311150"
-  }
-}
-carrier_id {
-  canonical_id: 1261
-  carrier_name: "Commnet Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311320"
-  }
-}
-carrier_id {
-  canonical_id: 1262
-  carrier_name: "Bag Tussel Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311330"
-  }
-}
-carrier_id {
-  canonical_id: 1263
-  carrier_name: "Illinois Valley Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "311340"
-  }
-}
-carrier_id {
-  canonical_id: 1264
-  carrier_name: "Torrestar Networks Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311350"
-  }
-}
-carrier_id {
-  canonical_id: 1265
-  carrier_name: "Stelera Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311360"
-  }
-}
-carrier_id {
-  canonical_id: 1299
-  carrier_name: "Mobifone"
-  carrier_attribute {
-    mccmnc_tuple: "45201"
-  }
-}
-carrier_id {
-  canonical_id: 1300
-  carrier_name: "Vinaphone"
-  carrier_attribute {
-    mccmnc_tuple: "45202"
-  }
-}
-carrier_id {
-  canonical_id: 1301
-  carrier_name: "SMILE"
-  carrier_attribute {
-    mccmnc_tuple: "54101"
-  }
-}
-carrier_id {
-  canonical_id: 1302
-  carrier_name: "Telecom Samoa Cellular Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "54901"
-  }
-}
-carrier_id {
-  canonical_id: 1307
-  carrier_name: "Sentech (Pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65506"
-  }
-}
-carrier_id {
-  canonical_id: 1308
-  carrier_name: "Cell C (Pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65507"
-  }
-}
-carrier_id {
-  canonical_id: 1309
-  carrier_name: "MTN"
-  carrier_attribute {
-    mccmnc_tuple: "65510"
-    mccmnc_tuple: "65512"
-  }
-}
-carrier_id {
-  canonical_id: 1310
-  carrier_name: "SAPS Gauteng"
-  carrier_attribute {
-    mccmnc_tuple: "65511"
-  }
-}
-carrier_id {
-  canonical_id: 1311
-  carrier_name: "Cape Town Metropolitan Council"
-  carrier_attribute {
-    mccmnc_tuple: "65521"
-  }
-}
-carrier_id {
-  canonical_id: 1312
-  carrier_name: "Bokamoso Consortium"
-  carrier_attribute {
-    mccmnc_tuple: "65530"
-  }
-}
-carrier_id {
-  canonical_id: 1313
-  carrier_name: "Karabo Telecoms (Pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65531"
-  }
-}
-carrier_id {
-  canonical_id: 1314
-  carrier_name: "Ilizwi Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "65532"
-  }
-}
-carrier_id {
-  canonical_id: 1315
-  carrier_name: "Thinta Thinta Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "65533"
-  }
-}
-carrier_id {
-  canonical_id: 1316
-  carrier_name: "Bokone Telecoms"
-  carrier_attribute {
-    mccmnc_tuple: "65534"
-  }
-}
-carrier_id {
-  canonical_id: 1317
-  carrier_name: "Kingdom Communications"
-  carrier_attribute {
-    mccmnc_tuple: "65535"
-  }
-}
-carrier_id {
-  canonical_id: 1318
-  carrier_name: "Amatole Telecommunication Services"
-  carrier_attribute {
-    mccmnc_tuple: "65536"
-  }
-}
-carrier_id {
-  canonical_id: 1319
-  carrier_name: "Airtel Zambia"
-  carrier_attribute {
-    mccmnc_tuple: "64501"
-  }
-}
-carrier_id {
-  canonical_id: 1320
-  carrier_name: "Telecel Zambia Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "64502"
-  }
-}
-carrier_id {
-  canonical_id: 1321
-  carrier_name: "Zamtel"
-  carrier_attribute {
-    mccmnc_tuple: "64503"
-  }
-}
-carrier_id {
-  canonical_id: 1322
-  carrier_name: "Net One"
-  carrier_attribute {
-    mccmnc_tuple: "64801"
-  }
-}
-carrier_id {
-  canonical_id: 1325
-  carrier_name: "Cable & Wireless (Antigua)"
-  carrier_attribute {
-    mccmnc_tuple: "344920"
-  }
-}
-carrier_id {
-  canonical_id: 1326
-  carrier_name: "AT&T Wireless (Antigua)"
-  carrier_attribute {
-    mccmnc_tuple: "344930"
-  }
-}
-carrier_id {
-  canonical_id: 1327
-  carrier_name: "Weblinks Limited"
-  carrier_attribute {
-    mccmnc_tuple: "365010"
-  }
-}
-carrier_id {
-  canonical_id: 1328
-  carrier_name: "One Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "27601"
-    gid1: "01"
-  }
-}
-carrier_id {
-  canonical_id: 1329
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "27602"
-    spn: "VODAFONE AL"
-  }
-}
-carrier_id {
-  canonical_id: 1330
-  carrier_name: "Eagle Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "27603"
-  }
-}
-carrier_id {
-  canonical_id: 1331
-  carrier_name: "TELCELL GSM"
-  carrier_attribute {
-    mccmnc_tuple: "36251"
-  }
-}
-carrier_id {
-  canonical_id: 1332
-  carrier_name: "CT GSM"
-  carrier_attribute {
-    mccmnc_tuple: "36269"
-  }
-}
-carrier_id {
-  canonical_id: 1333
-  carrier_name: "SETEL GSM"
-  carrier_attribute {
-    mccmnc_tuple: "36291"
-  }
-}
-carrier_id {
-  canonical_id: 1334
-  carrier_name: "Unitel"
-  carrier_attribute {
-    mccmnc_tuple: "63102"
-  }
-}
-carrier_id {
-  canonical_id: 1336
-  carrier_name: "Nextel Argentina srl"
-  carrier_attribute {
-    mccmnc_tuple: "722020"
-  }
-}
-carrier_id {
-  canonical_id: 1337
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "72207"
-  }
-}
-carrier_id {
-  canonical_id: 1338
-  carrier_name: "Claro AR"
-  carrier_attribute {
-    mccmnc_tuple: "722310"
-    mccmnc_tuple: "72231"
-  }
-}
-carrier_id {
-  canonical_id: 1339
-  carrier_name: "Compañía de Telefonos del Interior Norte S.A."
-  carrier_attribute {
-    mccmnc_tuple: "722320"
-  }
-}
-carrier_id {
-  canonical_id: 1340
-  carrier_name: "Compañía de Telefonos del Interior S.A."
-  carrier_attribute {
-    mccmnc_tuple: "722330"
-  }
-}
-carrier_id {
-  canonical_id: 1341
-  carrier_name: "Telecom Personal S.A."
-  carrier_attribute {
-    mccmnc_tuple: "722340"
-    mccmnc_tuple: "72234"
-    mccmnc_tuple: "722341"
-  }
-}
-carrier_id {
-  canonical_id: 1343
-  carrier_name: "Telefonica Austria"
-  carrier_attribute {
-    mccmnc_tuple: "23208"
-  }
-}
-carrier_id {
-  canonical_id: 1344
-  carrier_name: "Drei"
-  carrier_attribute {
-    mccmnc_tuple: "23205"
-    mccmnc_tuple: "23210"
-  }
-}
-carrier_id {
-  canonical_id: 1345
-  carrier_name: "Telstra"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    mccmnc_tuple: "50539"
-    mccmnc_tuple: "50571"
-    mccmnc_tuple: "50572"
-  }
-}
-carrier_id {
-  canonical_id: 1346
-  carrier_name: "Department of Defence"
-  carrier_attribute {
-    mccmnc_tuple: "50504"
-  }
-}
-carrier_id {
-  canonical_id: 1347
-  carrier_name: "The Ozitel Network Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50505"
-  }
-}
-carrier_id {
-  canonical_id: 1348
-  carrier_name: "Hutchison 3G Australia Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50506"
-  }
-}
-carrier_id {
-  canonical_id: 1349
-  carrier_name: "One.Tel GSM 1800 Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50508"
-    mccmnc_tuple: "50599"
-  }
-}
-carrier_id {
-  canonical_id: 1350
-  carrier_name: "Airnet Commercial Australia Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50509"
-  }
-}
-carrier_id {
-  canonical_id: 1351
-  carrier_name: "Hutchison Telecommunications (Australia) Pty. Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50512"
-  }
-}
-carrier_id {
-  canonical_id: 1352
-  carrier_name: "AAPT Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "50514"
-  }
-}
-carrier_id {
-  canonical_id: 1354
-  carrier_name: "Azercell Limited Liability Joint Venture"
-  carrier_attribute {
-    mccmnc_tuple: "40001"
-  }
-}
-carrier_id {
-  canonical_id: 1355
-  carrier_name: "Catel JV"
-  carrier_attribute {
-    mccmnc_tuple: "40003"
-  }
-}
-carrier_id {
-  canonical_id: 1356
-  carrier_name: "Azerphone LLC"
-  carrier_attribute {
-    mccmnc_tuple: "40004"
-  }
-}
-carrier_id {
-  canonical_id: 1357
-  carrier_name: "Eronet Mobile Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "21803"
-  }
-}
-carrier_id {
-  canonical_id: 1358
-  carrier_name: "MOBI'S (Mobilina Srpske)"
-  carrier_attribute {
-    mccmnc_tuple: "21805"
-  }
-}
-carrier_id {
-  canonical_id: 1359
-  carrier_name: "GSMBIH"
-  carrier_attribute {
-    mccmnc_tuple: "21890"
-  }
-}
-carrier_id {
-  canonical_id: 1360
-  carrier_name: "Cable & Wireless (Barbados) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "342600"
-  }
-}
-carrier_id {
-  canonical_id: 1361
-  carrier_name: "Sunbeach Communications"
-  carrier_attribute {
-    mccmnc_tuple: "342820"
-  }
-}
-carrier_id {
-  canonical_id: 1362
-  carrier_name: "Grameenphone"
-  carrier_attribute {
-    mccmnc_tuple: "47001"
-  }
-}
-carrier_id {
-  canonical_id: 1363
-  carrier_name: "Aktel"
-  carrier_attribute {
-    mccmnc_tuple: "47002"
-  }
-}
-carrier_id {
-  canonical_id: 1364
-  carrier_name: "Mobile 2000"
-  carrier_attribute {
-    mccmnc_tuple: "47003"
-  }
-}
-carrier_id {
-  canonical_id: 1365
-  carrier_name: "Proximus"
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-  }
-}
-carrier_id {
-  canonical_id: 1366
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "20610"
-  }
-}
-carrier_id {
-  canonical_id: 1367
-  carrier_name: "BASE"
-  carrier_attribute {
-    mccmnc_tuple: "20620"
-  }
-}
-carrier_id {
-  canonical_id: 1368
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "61302"
-  }
-}
-carrier_id {
-  canonical_id: 1369
-  carrier_name: "Telecel"
-  carrier_attribute {
-    mccmnc_tuple: "61303"
-  }
-}
-carrier_id {
-  canonical_id: 1370
-  carrier_name: "A1"
-  carrier_attribute {
-    mccmnc_tuple: "28401"
-  }
-}
-carrier_id {
-  canonical_id: 1371
-  carrier_name: "Yettel"
-  carrier_attribute {
-    mccmnc_tuple: "28405"
-  }
-}
-carrier_id {
-  canonical_id: 1372
-  carrier_name: "Batelco"
-  carrier_attribute {
-    mccmnc_tuple: "42601"
-    mccmnc_tuple: "42605"
-  }
-}
-carrier_id {
-  canonical_id: 1373
-  carrier_name: "Spacetel Burundi"
-  carrier_attribute {
-    mccmnc_tuple: "64201"
-  }
-}
-carrier_id {
-  canonical_id: 1374
-  carrier_name: "Safaris"
-  carrier_attribute {
-    mccmnc_tuple: "64202"
-  }
-}
-carrier_id {
-  canonical_id: 1375
-  carrier_name: "Telecel Burundi Company"
-  carrier_attribute {
-    mccmnc_tuple: "64203"
-  }
-}
-carrier_id {
-  canonical_id: 1376
-  carrier_name: "Libercom"
-  carrier_attribute {
-    mccmnc_tuple: "61601"
-  }
-}
-carrier_id {
-  canonical_id: 1377
-  carrier_name: "Telecel"
-  carrier_attribute {
-    mccmnc_tuple: "61602"
-  }
-}
-carrier_id {
-  canonical_id: 1378
-  carrier_name: "Spacetel Benin"
-  carrier_attribute {
-    mccmnc_tuple: "61603"
-  }
-}
-carrier_id {
-  canonical_id: 1379
-  carrier_name: "DST Com"
-  carrier_attribute {
-    mccmnc_tuple: "52811"
-  }
-}
-carrier_id {
-  canonical_id: 1380
-  carrier_name: "Nuevatel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "73601"
-  }
-}
-carrier_id {
-  canonical_id: 1381
-  carrier_name: "ENTEL S.A."
-  carrier_attribute {
-    mccmnc_tuple: "73602"
-  }
-}
-carrier_id {
-  canonical_id: 1382
-  carrier_name: "Telecel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "73603"
-  }
-}
-carrier_id {
-  canonical_id: 1383
-  carrier_name: "Nextel"
-  carrier_attribute {
-    mccmnc_tuple: "72400"
-    mccmnc_tuple: "72439"
-  }
-}
-carrier_id {
-  canonical_id: 1384
-  carrier_name: "CRT Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "72401"
-  }
-}
-carrier_id {
-  canonical_id: 1385
-  carrier_name: "TIM"
-  carrier_attribute {
-    mccmnc_tuple: "72402"
-    mccmnc_tuple: "72403"
-    mccmnc_tuple: "72404"
-    mccmnc_tuple: "72454"
-  }
-}
-carrier_id {
-  canonical_id: 1388
-  carrier_name: "Sercontel Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72407"
-  }
-}
-carrier_id {
-  canonical_id: 1389
-  carrier_name: "Oi"
-  carrier_attribute {
-    mccmnc_tuple: "72430"
-    mccmnc_tuple: "72431"
-    mccmnc_tuple: "72424"
-  }
-}
-carrier_id {
-  canonical_id: 1390
-  carrier_name: "Algar Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "72432"
-    mccmnc_tuple: "72433"
-    mccmnc_tuple: "72434"
-  }
-}
-carrier_id {
-  canonical_id: 1391
-  carrier_name: "Telebahia Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72435"
-  }
-}
-carrier_id {
-  canonical_id: 1392
-  carrier_name: "Telergipe Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72437"
-  }
-}
-carrier_id {
-  canonical_id: 1394
-  carrier_name: "Telpe Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72441"
-  }
-}
-carrier_id {
-  canonical_id: 1395
-  carrier_name: "Telepisa Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72443"
-  }
-}
-carrier_id {
-  canonical_id: 1396
-  carrier_name: "Telpa Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72445"
-  }
-}
-carrier_id {
-  canonical_id: 1397
-  carrier_name: "Telern Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72447"
-  }
-}
-carrier_id {
-  canonical_id: 1398
-  carrier_name: "Teleceara Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72448"
-  }
-}
-carrier_id {
-  canonical_id: 1399
-  carrier_name: "Telma Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72451"
-  }
-}
-carrier_id {
-  canonical_id: 1400
-  carrier_name: "Telepara Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72453"
-  }
-}
-carrier_id {
-  canonical_id: 1401
-  carrier_name: "Teleamazon Cel"
-  carrier_attribute {
-    mccmnc_tuple: "72455"
-  }
-}
-carrier_id {
-  canonical_id: 1402
-  carrier_name: "B-Mobile of Bhutan Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "40217"
-  }
-}
-carrier_id {
-  canonical_id: 1403
-  carrier_name: "Rogers"
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    mccmnc_tuple: "30272"
-  }
-}
-carrier_id {
-  canonical_id: 1404
-  carrier_name: "TELUS Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "302221"
-    mccmnc_tuple: "30222"
-    mccmnc_tuple: "30286"
-    gid1: "5455"
-  }
-}
-carrier_id {
-  canonical_id: 1405
-  carrier_name: "Vodacom Congo RDC sprl"
-  carrier_attribute {
-    mccmnc_tuple: "63001"
-  }
-}
-carrier_id {
-  canonical_id: 1406
-  carrier_name: "Supercell Sprl"
-  carrier_attribute {
-    mccmnc_tuple: "63005"
-  }
-}
-carrier_id {
-  canonical_id: 1407
-  carrier_name: "Orange RDC"
-  carrier_attribute {
-    mccmnc_tuple: "63086"
-  }
-}
-carrier_id {
-  canonical_id: 1408
-  carrier_name: "Centrafrique Telecom Plus (CTP)"
-  carrier_attribute {
-    mccmnc_tuple: "62301"
-  }
-}
-carrier_id {
-  canonical_id: 1409
-  carrier_name: "Telecel Centrafrique (TC)"
-  carrier_attribute {
-    mccmnc_tuple: "62302"
-  }
-}
-carrier_id {
-  canonical_id: 1410
-  carrier_name: "Orange Centrafricaine"
-  carrier_attribute {
-    mccmnc_tuple: "62303"
-  }
-}
-carrier_id {
-  canonical_id: 1411
-  carrier_name: "Airtel Congo"
-  carrier_attribute {
-    mccmnc_tuple: "62901"
-  }
-}
-carrier_id {
-  canonical_id: 1412
-  carrier_name: "Libertis Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "62910"
-  }
-}
-carrier_id {
-  canonical_id: 1413
-  carrier_name: "Sunrise"
-  carrier_attribute {
-    mccmnc_tuple: "22802"
-    mccmnc_tuple: "22812"
-  }
-}
-carrier_id {
-  canonical_id: 1414
-  carrier_name: "Salt"
-  carrier_attribute {
-    mccmnc_tuple: "22803"
-  }
-}
-carrier_id {
-  canonical_id: 1415
-  carrier_name: "Comfone AG"
-  carrier_attribute {
-    mccmnc_tuple: "22805"
-  }
-}
-carrier_id {
-  canonical_id: 1416
-  carrier_name: "SBB AG"
-  carrier_attribute {
-    mccmnc_tuple: "22806"
-  }
-}
-carrier_id {
-  canonical_id: 1417
-  carrier_name: "IN&Phone SA"
-  carrier_attribute {
-    mccmnc_tuple: "22807"
-  }
-}
-carrier_id {
-  canonical_id: 1418
-  carrier_name: "Tele2 Telecommunications AG"
-  carrier_attribute {
-    mccmnc_tuple: "22808"
-  }
-}
-carrier_id {
-  canonical_id: 1419
-  carrier_name: "Bebbicell AG"
-  carrier_attribute {
-    mccmnc_tuple: "22851"
-  }
-}
-carrier_id {
-  canonical_id: 1420
-  carrier_name: "Atlantique Cellulaire"
-  carrier_attribute {
-    mccmnc_tuple: "61202"
-  }
-}
-carrier_id {
-  canonical_id: 1421
-  carrier_name: "Orange Côte d'Ivoire"
-  carrier_attribute {
-    mccmnc_tuple: "61203"
-  }
-}
-carrier_id {
-  canonical_id: 1422
-  carrier_name: "Comium Côte d'Ivoire"
-  carrier_attribute {
-    mccmnc_tuple: "61204"
-  }
-}
-carrier_id {
-  canonical_id: 1423
-  carrier_name: "Loteny Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "61205"
-  }
-}
-carrier_id {
-  canonical_id: 1424
-  carrier_name: "Oricel Côte d'Ivoire"
-  carrier_attribute {
-    mccmnc_tuple: "61206"
-  }
-}
-carrier_id {
-  canonical_id: 1425
-  carrier_name: "Aircomm Côte d'Ivoire"
-  carrier_attribute {
-    mccmnc_tuple: "61207"
-  }
-}
-carrier_id {
-  canonical_id: 1426
-  carrier_name: "Telecom Cook"
-  carrier_attribute {
-    mccmnc_tuple: "54801"
-  }
-}
-carrier_id {
-  canonical_id: 1427
-  carrier_name: "Entel"
-  carrier_attribute {
-    mccmnc_tuple: "73001"
-    mccmnc_tuple: "73010"
-    mccmnc_tuple: "73026"
-  }
-}
-carrier_id {
-  canonical_id: 1428
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "73002"
-    mccmnc_tuple: "73007"
-  }
-}
-carrier_id {
-  canonical_id: 1429
-  carrier_name: "Claro CL"
-  carrier_attribute {
-    mccmnc_tuple: "73003"
-  }
-}
-carrier_id {
-  canonical_id: 1430
-  carrier_name: "WOM"
-  carrier_attribute {
-    mccmnc_tuple: "73004"
-    mccmnc_tuple: "73009"
-  }
-}
-carrier_id {
-  canonical_id: 1431
-  carrier_name: "Multikom S.A."
-  carrier_attribute {
-    mccmnc_tuple: "73005"
-  }
-}
-carrier_id {
-  canonical_id: 1433
-  carrier_name: "Mobile Telephone Networks Cameroon"
-  carrier_attribute {
-    mccmnc_tuple: "62401"
-  }
-}
-carrier_id {
-  canonical_id: 1434
-  carrier_name: "Orange Cameroun"
-  carrier_attribute {
-    mccmnc_tuple: "62402"
-  }
-}
-carrier_id {
-  canonical_id: 1435
-  carrier_name: "China Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "46000"
-    mccmnc_tuple: "46002"
-    mccmnc_tuple: "46004"
-    mccmnc_tuple: "46007"
-    mccmnc_tuple: "46008"
-  }
-}
-carrier_id {
-  canonical_id: 1436
-  carrier_name: "China Unicom"
-  carrier_attribute {
-    mccmnc_tuple: "46001"
-    mccmnc_tuple: "46006"
-    mccmnc_tuple: "46009"
-  }
-}
-carrier_id {
-  canonical_id: 1438
-  carrier_name: "Colombia Telecomunicaciones S.A. - Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "732001"
-  }
-}
-carrier_id {
-  canonical_id: 1439
-  carrier_name: "Edatel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "732002"
-  }
-}
-carrier_id {
-  canonical_id: 1440
-  carrier_name: "Emtelsa"
-  carrier_attribute {
-    mccmnc_tuple: "732020"
-  }
-}
-carrier_id {
-  canonical_id: 1441
-  carrier_name: "Emcali"
-  carrier_attribute {
-    mccmnc_tuple: "732099"
-  }
-}
-carrier_id {
-  canonical_id: 1442
-  carrier_name: "Claro CO"
-  carrier_attribute {
-    mccmnc_tuple: "732101"
-  }
-}
-carrier_id {
-  canonical_id: 1443
-  carrier_name: "Bellsouth Colombia S.A."
-  carrier_attribute {
-    mccmnc_tuple: "732102"
-  }
-}
-carrier_id {
-  canonical_id: 1444
-  carrier_name: "ETECSA"
-  carrier_attribute {
-    mccmnc_tuple: "36801"
-  }
-}
-carrier_id {
-  canonical_id: 1445
-  carrier_name: "Cabo Verde Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "62501"
-  }
-}
-carrier_id {
-  canonical_id: 1446
-  carrier_name: "T+Telecomunicaçôes"
-  carrier_attribute {
-    mccmnc_tuple: "62502"
-  }
-}
-carrier_id {
-  canonical_id: 1447
-  carrier_name: "CYTA"
-  carrier_attribute {
-    mccmnc_tuple: "28001"
-  }
-}
-carrier_id {
-  canonical_id: 1448
-  carrier_name: "epic"
-  carrier_attribute {
-    mccmnc_tuple: "28010"
-  }
-}
-carrier_id {
-  canonical_id: 1449
-  carrier_name: "O2"
-  carrier_attribute {
-    mccmnc_tuple: "23002"
-  }
-}
-carrier_id {
-  canonical_id: 1450
-  carrier_name: "Mobilkom a.s."
-  carrier_attribute {
-    mccmnc_tuple: "23004"
-  }
-}
-carrier_id {
-  canonical_id: 1451
-  carrier_name: "Sprava Zeleznicni Dopravni Cesty"
-  carrier_attribute {
-    mccmnc_tuple: "23098"
-  }
-}
-carrier_id {
-  canonical_id: 1452
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "23003"
-    spn: "Vodafone CZ"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23099"
-    imsi_prefix_xpattern: "x"
-  }
-}
-carrier_id {
-  canonical_id: 1453
-  carrier_name: "Telefonica"
-  carrier_attribute {
-    mccmnc_tuple: "26203"
-    mccmnc_tuple: "26205"
-    mccmnc_tuple: "26277"
-  }
-}
-carrier_id {
-  canonical_id: 1454
-  carrier_name: "o2"
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    mccmnc_tuple: "26208"
-  }
-}
-carrier_id {
-  canonical_id: 1455
-  carrier_name: "Arcor AG & Co."
-  carrier_attribute {
-    mccmnc_tuple: "26210"
-  }
-}
-carrier_id {
-  canonical_id: 1456
-  carrier_name: "O2 (Germany) GmbH & Co. OHG"
-  carrier_attribute {
-    mccmnc_tuple: "26211"
-  }
-}
-carrier_id {
-  canonical_id: 1457
-  carrier_name: "Dolphin Telecom (Deutschland) GmbH"
-  carrier_attribute {
-    mccmnc_tuple: "26212"
-  }
-}
-carrier_id {
-  canonical_id: 1458
-  carrier_name: "Mobilcom Multimedia GmbH"
-  carrier_attribute {
-    mccmnc_tuple: "26213"
-  }
-}
-carrier_id {
-  canonical_id: 1459
-  carrier_name: "Group 3G UMTS GmbH (Quam)"
-  carrier_attribute {
-    mccmnc_tuple: "26214"
-  }
-}
-carrier_id {
-  canonical_id: 1460
-  carrier_name: "Airdata AG"
-  carrier_attribute {
-    mccmnc_tuple: "26215"
-  }
-}
-carrier_id {
-  canonical_id: 1461
-  carrier_name: "Siemens AG, ICMNPGUSTA"
-  carrier_attribute {
-    mccmnc_tuple: "26276"
-  }
-}
-carrier_id {
-  canonical_id: 1462
-  carrier_name: "Evatis"
-  carrier_attribute {
-    mccmnc_tuple: "63801"
-  }
-}
-carrier_id {
-  canonical_id: 1463
-  carrier_name: "TDC Mobil"
-  carrier_attribute {
-    mccmnc_tuple: "23801"
-    mccmnc_tuple: "23810"
-  }
-}
-carrier_id {
-  canonical_id: 1464
-  carrier_name: "Telenor"
-  carrier_attribute {
-    mccmnc_tuple: "23802"
-    mccmnc_tuple: "23866"
-  }
-}
-carrier_id {
-  canonical_id: 1465
-  carrier_name: "MIGway A/S"
-  carrier_attribute {
-    mccmnc_tuple: "23803"
-  }
-}
-carrier_id {
-  canonical_id: 1466
-  carrier_name: "3"
-  carrier_attribute {
-    mccmnc_tuple: "23806"
-  }
-}
-carrier_id {
-  canonical_id: 1467
-  carrier_name: "Claro RD"
-  carrier_attribute {
-    mccmnc_tuple: "37002"
-    mccmnc_tuple: "370020"
-  }
-}
-carrier_id {
-  canonical_id: 1468
-  carrier_name: "Tricom S.A."
-  carrier_attribute {
-    mccmnc_tuple: "37003"
-  }
-}
-carrier_id {
-  canonical_id: 1469
-  carrier_name: "CentennialDominicana"
-  carrier_attribute {
-    mccmnc_tuple: "37004"
-  }
-}
-carrier_id {
-  canonical_id: 1470
-  carrier_name: "Algérie Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "60301"
-  }
-}
-carrier_id {
-  canonical_id: 1471
-  carrier_name: "Orascom Telecom Algérie"
-  carrier_attribute {
-    mccmnc_tuple: "60302"
-  }
-}
-carrier_id {
-  canonical_id: 1472
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "74000"
-  }
-}
-carrier_id {
-  canonical_id: 1473
-  carrier_name: "Claro EC"
-  carrier_attribute {
-    mccmnc_tuple: "74001"
-    mccmnc_tuple: "740010"
-  }
-}
-carrier_id {
-  canonical_id: 1474
-  carrier_name: "Telecsa S.A."
-  carrier_attribute {
-    mccmnc_tuple: "74002"
-  }
-}
-carrier_id {
-  canonical_id: 1475
-  carrier_name: "Elisa"
-  carrier_attribute {
-    mccmnc_tuple: "24405"
-    mccmnc_tuple: "24421"
-  }
-}
-carrier_id {
-  canonical_id: 1476
-  carrier_name: "Finnet Group"
-  carrier_attribute {
-    mccmnc_tuple: "24409"
-  }
-}
-carrier_id {
-  canonical_id: 1477
-  carrier_name: "Alands Mobiltelefon AB"
-  carrier_attribute {
-    mccmnc_tuple: "24414"
-  }
-}
-carrier_id {
-  canonical_id: 1478
-  carrier_name: "Oy Finland Tele2 AB"
-  carrier_attribute {
-    mccmnc_tuple: "24416"
-  }
-}
-carrier_id {
-  canonical_id: 1480
-  carrier_name: "Telia"
-  carrier_attribute {
-    mccmnc_tuple: "24491"
-  }
-}
-carrier_id {
-  canonical_id: 1481
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "54201"
-  }
-}
-carrier_id {
-  canonical_id: 1482
-  carrier_name: "FSM Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "55001"
-  }
-}
-carrier_id {
-  canonical_id: 1483
-  carrier_name: "Faroese Telecom - GSM"
-  carrier_attribute {
-    mccmnc_tuple: "28801"
-  }
-}
-carrier_id {
-  canonical_id: 1484
-  carrier_name: "Kall GSM"
-  carrier_attribute {
-    mccmnc_tuple: "28802"
-  }
-}
-carrier_id {
-  canonical_id: 1486
-  carrier_name: "Globalstar Europe"
-  carrier_attribute {
-    mccmnc_tuple: "20805"
-    mccmnc_tuple: "20806"
-    mccmnc_tuple: "20807"
-  }
-}
-carrier_id {
-  canonical_id: 1487
-  carrier_name: "Bouygues Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "20820"
-    mccmnc_tuple: "20821"
-    mccmnc_tuple: "20888"
-  }
-}
-carrier_id {
-  canonical_id: 1488
-  carrier_name: "Libertis S.A."
-  carrier_attribute {
-    mccmnc_tuple: "62801"
-  }
-}
-carrier_id {
-  canonical_id: 1489
-  carrier_name: "Telecel Gabon S.A."
-  carrier_attribute {
-    mccmnc_tuple: "62802"
-  }
-}
-carrier_id {
-  canonical_id: 1490
-  carrier_name: "Airtel Gabon"
-  carrier_attribute {
-    mccmnc_tuple: "62803"
-  }
-}
-carrier_id {
-  canonical_id: 1491
-  carrier_name: "Mapesbury Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "23401"
-  }
-}
-carrier_id {
-  canonical_id: 1492
-  carrier_name: "O2"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-  }
-}
-carrier_id {
-  canonical_id: 1493
-  carrier_name: "Jersey Telenet Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23403"
-  }
-}
-carrier_id {
-  canonical_id: 1494
-  carrier_name: "FMS Solutions Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23404"
-  }
-}
-carrier_id {
-  canonical_id: 1495
-  carrier_name: "Spitfire Network Services Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23405"
-  }
-}
-carrier_id {
-  canonical_id: 1496
-  carrier_name: "Internet One Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23406"
-  }
-}
-carrier_id {
-  canonical_id: 1497
-  carrier_name: "Cable and Wireless plc"
-  carrier_attribute {
-    mccmnc_tuple: "23407"
-  }
-}
-carrier_id {
-  canonical_id: 1498
-  carrier_name: "Wire9 Telecom plc"
-  carrier_attribute {
-    mccmnc_tuple: "23409"
-    mccmnc_tuple: "23418"
-  }
-}
-carrier_id {
-  canonical_id: 1500
-  carrier_name: "Ntework Rail Infrastructure Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23412"
-    mccmnc_tuple: "23413"
-  }
-}
-carrier_id {
-  canonical_id: 1501
-  carrier_name: "Hay Systems Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23414"
-  }
-}
-carrier_id {
-  canonical_id: 1502
-  carrier_name: "Opal Telecom Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23416"
-  }
-}
-carrier_id {
-  canonical_id: 1503
-  carrier_name: "Flextel Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23417"
-  }
-}
-carrier_id {
-  canonical_id: 1504
-  carrier_name: "Teleware plc"
-  carrier_attribute {
-    mccmnc_tuple: "23419"
-  }
-}
-carrier_id {
-  canonical_id: 1505
-  carrier_name: "Three Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    mccmnc_tuple: "23494"
-    mccmnc_tuple: "23594"
-  }
-}
-carrier_id {
-  canonical_id: 1506
-  carrier_name: "Jersey Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "23450"
-  }
-}
-carrier_id {
-  canonical_id: 1507
-  carrier_name: "Manx Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "23458"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    gid1: "519"
-  }
-}
-carrier_id {
-  canonical_id: 1508
-  carrier_name: "Inquam Telecom (Holdings) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "23475"
-  }
-}
-carrier_id {
-  canonical_id: 1509
-  carrier_name: "British Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "23400"
-    mccmnc_tuple: "23476"
-  }
-}
-carrier_id {
-  canonical_id: 1510
-  carrier_name: "Airwave mmO2 Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "23478"
-  }
-}
-carrier_id {
-  canonical_id: 1511
-  carrier_name: "Geocell Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "28201"
-  }
-}
-carrier_id {
-  canonical_id: 1512
-  carrier_name: "Magti GSM Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "28202"
-  }
-}
-carrier_id {
-  canonical_id: 1513
-  carrier_name: "Iberiatel Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "28203"
-  }
-}
-carrier_id {
-  canonical_id: 1514
-  carrier_name: "Mobitel Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "28204"
-  }
-}
-carrier_id {
-  canonical_id: 1515
-  carrier_name: "MTN"
-  carrier_attribute {
-    mccmnc_tuple: "62001"
-  }
-}
-carrier_id {
-  canonical_id: 1516
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "62002"
-    spn: "Vodafone GH"
-  }
-}
-carrier_id {
-  canonical_id: 1518
-  carrier_name: "Kasapa Telecom Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "62004"
-  }
-}
-carrier_id {
-  canonical_id: 1519
-  carrier_name: "Telestet"
-  carrier_attribute {
-    mccmnc_tuple: "20210"
-  }
-}
-carrier_id {
-  canonical_id: 1520
-  carrier_name: "Claro GT"
-  carrier_attribute {
-    mccmnc_tuple: "70401"
-  }
-}
-carrier_id {
-  canonical_id: 1521
-  carrier_name: "Comunicaciones Celulares S.A."
-  carrier_attribute {
-    mccmnc_tuple: "70402"
-  }
-}
-carrier_id {
-  canonical_id: 1522
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "70403"
-    mccmnc_tuple: "704030"
-  }
-}
-carrier_id {
-  canonical_id: 1523
-  carrier_name: "Guinétel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "63201"
-  }
-}
-carrier_id {
-  canonical_id: 1524
-  carrier_name: "Spacetel Guiné-Bissau S.A."
-  carrier_attribute {
-    mccmnc_tuple: "63202"
-  }
-}
-carrier_id {
-  canonical_id: 1525
-  carrier_name: "Cel*Star (Guyana) Inc."
-  carrier_attribute {
-    mccmnc_tuple: "73801"
-  }
-}
-carrier_id {
-  canonical_id: 1526
-  carrier_name: "1O1O / csl / Club Sim"
-  carrier_attribute {
-    mccmnc_tuple: "45400"
-    mccmnc_tuple: "45419"
-  }
-}
-carrier_id {
-  canonical_id: 1527
-  carrier_name: "MVNO/CITIC"
-  carrier_attribute {
-    mccmnc_tuple: "45401"
-  }
-}
-carrier_id {
-  canonical_id: 1528
-  carrier_name: "Celtel"
-  carrier_attribute {
-    mccmnc_tuple: "708002"
-    mccmnc_tuple: "70802"
-    mccmnc_tuple: "708020"
-  }
-}
-carrier_id {
-  canonical_id: 1529
-  carrier_name: "Telemach"
-  carrier_attribute {
-    mccmnc_tuple: "21902"
-  }
-}
-carrier_id {
-  canonical_id: 1530
-  carrier_name: "A1/Tomato"
-  carrier_attribute {
-    mccmnc_tuple: "21910"
-  }
-}
-carrier_id {
-  canonical_id: 1531
-  carrier_name: "Comcel"
-  carrier_attribute {
-    mccmnc_tuple: "37201"
-  }
-}
-carrier_id {
-  canonical_id: 1532
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "37202"
-  }
-}
-carrier_id {
-  canonical_id: 1533
-  carrier_name: "Rectel"
-  carrier_attribute {
-    mccmnc_tuple: "37203"
-  }
-}
-carrier_id {
-  canonical_id: 1534
-  carrier_name: "Yettel"
-  carrier_attribute {
-    mccmnc_tuple: "21601"
-  }
-}
-carrier_id {
-  canonical_id: 1535
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "21670"
-    spn: ""
-    spn: "vodafone HU"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21670"
-    imsi_prefix_xpattern: "21670xx2"
-  }
-}
-carrier_id {
-  canonical_id: 1536
-  carrier_name: "PSN"
-  carrier_attribute {
-    mccmnc_tuple: "51000"
-  }
-}
-carrier_id {
-  canonical_id: 1537
-  carrier_name: "Indosat"
-  carrier_attribute {
-    mccmnc_tuple: "51001"
-  }
-}
-carrier_id {
-  canonical_id: 1543
-  carrier_name: "Reliance"
-  carrier_attribute {
-    mccmnc_tuple: "40409"
-    mccmnc_tuple: "40418"
-    mccmnc_tuple: "40436"
-    mccmnc_tuple: "40450"
-    mccmnc_tuple: "40452"
-    mccmnc_tuple: "40467"
-    mccmnc_tuple: "40485"
-    mccmnc_tuple: "40501"
-    mccmnc_tuple: "40503"
-    mccmnc_tuple: "40504"
-    mccmnc_tuple: "40505"
-    mccmnc_tuple: "40506"
-    mccmnc_tuple: "40507"
-    mccmnc_tuple: "40508"
-    mccmnc_tuple: "40509"
-    mccmnc_tuple: "40510"
-    mccmnc_tuple: "40511"
-    mccmnc_tuple: "40512"
-    mccmnc_tuple: "40513"
-    mccmnc_tuple: "40514"
-    mccmnc_tuple: "40515"
-    mccmnc_tuple: "40517"
-    mccmnc_tuple: "40518"
-    mccmnc_tuple: "40519"
-    mccmnc_tuple: "40520"
-    mccmnc_tuple: "40521"
-    mccmnc_tuple: "40522"
-    mccmnc_tuple: "40523"
-  }
-}
-carrier_id {
-  canonical_id: 1545
-  carrier_name: "BPL Mobile Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "40421"
-  }
-}
-carrier_id {
-  canonical_id: 1549
-  carrier_name: "Bharat Sanchar Nigam Ltd. (BSNL)"
-  carrier_attribute {
-    mccmnc_tuple: "40434"
-    mccmnc_tuple: "40438"
-    mccmnc_tuple: "40451"
-    mccmnc_tuple: "40453"
-    mccmnc_tuple: "40454"
-    mccmnc_tuple: "40455"
-    mccmnc_tuple: "40457"
-    mccmnc_tuple: "40458"
-    mccmnc_tuple: "40459"
-    mccmnc_tuple: "40462"
-    mccmnc_tuple: "40464"
-    mccmnc_tuple: "40466"
-    mccmnc_tuple: "40471"
-    mccmnc_tuple: "40472"
-    mccmnc_tuple: "40473"
-    mccmnc_tuple: "40474"
-    mccmnc_tuple: "40475"
-    mccmnc_tuple: "40476"
-    mccmnc_tuple: "40477"
-    mccmnc_tuple: "40479"
-    mccmnc_tuple: "40480"
-    mccmnc_tuple: "40481"
-  }
-}
-carrier_id {
-  canonical_id: 1550
-  carrier_name: "RPG Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "40441"
-  }
-}
-carrier_id {
-  canonical_id: 1551
-  carrier_name: "Aircel Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "40442"
-    mccmnc_tuple: "40425"
-    mccmnc_tuple: "40428"
-    mccmnc_tuple: "40429"
-    mccmnc_tuple: "40437"
-    mccmnc_tuple: "40491"
-    mccmnc_tuple: "405800"
-    mccmnc_tuple: "405801"
-    mccmnc_tuple: "405802"
-    mccmnc_tuple: "405803"
-    mccmnc_tuple: "405804"
-    mccmnc_tuple: "405805"
-    mccmnc_tuple: "405806"
-    mccmnc_tuple: "405807"
-    mccmnc_tuple: "405808"
-    mccmnc_tuple: "405809"
-    mccmnc_tuple: "405810"
-    mccmnc_tuple: "405811"
-    mccmnc_tuple: "405812"
-  }
-}
-carrier_id {
-  canonical_id: 1556
-  carrier_name: "Mahanagar Telephone Nigam Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "40468"
-    mccmnc_tuple: "40469"
-  }
-}
-carrier_id {
-  canonical_id: 1559
-  carrier_name: "Reliable Internet Services Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "40483"
-  }
-}
-carrier_id {
-  canonical_id: 1562
-  carrier_name: "IR-MCI (Hamrahe Avval)"
-  carrier_attribute {
-    mccmnc_tuple: "43211"
-  }
-}
-carrier_id {
-  canonical_id: 1563
-  carrier_name: "Telecommunication Kish Co. (KIFZO)"
-  carrier_attribute {
-    mccmnc_tuple: "43214"
-  }
-}
-carrier_id {
-  canonical_id: 1564
-  carrier_name: "MTCE (Espadan)"
-  carrier_attribute {
-    mccmnc_tuple: "43219"
-  }
-}
-carrier_id {
-  canonical_id: 1565
-  carrier_name: "Iceland Telecom Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "27401"
-  }
-}
-carrier_id {
-  canonical_id: 1566
-  carrier_name: "Tal hf"
-  carrier_attribute {
-    mccmnc_tuple: "27402"
-  }
-}
-carrier_id {
-  canonical_id: 1567
-  carrier_name: "Islandssimi GSM ehf"
-  carrier_attribute {
-    mccmnc_tuple: "27403"
-  }
-}
-carrier_id {
-  canonical_id: 1568
-  carrier_name: "IMC Islande ehf"
-  carrier_attribute {
-    mccmnc_tuple: "27404"
-  }
-}
-carrier_id {
-  canonical_id: 1569
-  carrier_name: "IceCell ehf"
-  carrier_attribute {
-    mccmnc_tuple: "27407"
-  }
-}
-carrier_id {
-  canonical_id: 1571
-  carrier_name: "Elsacom"
-  carrier_attribute {
-    mccmnc_tuple: "22202"
-  }
-}
-carrier_id {
-  canonical_id: 1572
-  carrier_name: "IPSE 2000"
-  carrier_attribute {
-    mccmnc_tuple: "22277"
-  }
-}
-carrier_id {
-  canonical_id: 1573
-  carrier_name: "WINDTRE"
-  carrier_attribute {
-    mccmnc_tuple: "22288"
-  }
-}
-carrier_id {
-  canonical_id: 1574
-  carrier_name: "Blu"
-  carrier_attribute {
-    mccmnc_tuple: "22298"
-  }
-}
-carrier_id {
-  canonical_id: 1575
-  carrier_name: "WINDTRE"
-  carrier_attribute {
-    mccmnc_tuple: "22299"
-  }
-}
-carrier_id {
-  canonical_id: 1576
-  carrier_name: "Cable & Wireless Jamaica Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "338020"
-  }
-}
-carrier_id {
-  canonical_id: 1577
-  carrier_name: "Mossel (Jamaica) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "338050"
-    mccmnc_tuple: "33805"
-  }
-}
-carrier_id {
-  canonical_id: 1578
-  carrier_name: "Fastlink"
-  carrier_attribute {
-    mccmnc_tuple: "41601"
-  }
-}
-carrier_id {
-  canonical_id: 1579
-  carrier_name: "Xpress"
-  carrier_attribute {
-    mccmnc_tuple: "41602"
-  }
-}
-carrier_id {
-  canonical_id: 1580
-  carrier_name: "Umniah"
-  carrier_attribute {
-    mccmnc_tuple: "41603"
-  }
-}
-carrier_id {
-  canonical_id: 1581
-  carrier_name: "au"
-  carrier_attribute {
-    mccmnc_tuple: "44050"
-    mccmnc_tuple: "44051"
-    mccmnc_tuple: "44052"
-    mccmnc_tuple: "44054"
-    gid1: "10"
-  }
-}
-carrier_id {
-  canonical_id: 1585
-  carrier_name: "Zain"
-  carrier_attribute {
-    mccmnc_tuple: "41902"
-  }
-}
-carrier_id {
-  canonical_id: 1586
-  carrier_name: "Ooredoo"
-  carrier_attribute {
-    mccmnc_tuple: "41903"
-  }
-}
-carrier_id {
-  canonical_id: 1587
-  carrier_name: "Cable & Wireless (Cayman)"
-  carrier_attribute {
-    mccmnc_tuple: "346140"
-  }
-}
-carrier_id {
-  canonical_id: 1588
-  carrier_name: "Beeline"
-  carrier_attribute {
-    mccmnc_tuple: "40101"
-  }
-}
-carrier_id {
-  canonical_id: 1589
-  carrier_name: "Kcell/activ"
-  carrier_attribute {
-    mccmnc_tuple: "40102"
-  }
-}
-carrier_id {
-  canonical_id: 1590
-  carrier_name: "Lao Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "45701"
-  }
-}
-carrier_id {
-  canonical_id: 1591
-  carrier_name: "ETL Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "45702"
-  }
-}
-carrier_id {
-  canonical_id: 1592
-  carrier_name: "Millicom"
-  carrier_attribute {
-    mccmnc_tuple: "45708"
-  }
-}
-carrier_id {
-  canonical_id: 1593
-  carrier_name: "Cellis"
-  carrier_attribute {
-    mccmnc_tuple: "41532"
-    mccmnc_tuple: "41533"
-    mccmnc_tuple: "41534"
-    mccmnc_tuple: "41535"
-  }
-}
-carrier_id {
-  canonical_id: 1594
-  carrier_name: "Libancell"
-  carrier_attribute {
-    mccmnc_tuple: "41536"
-    mccmnc_tuple: "41537"
-    mccmnc_tuple: "41538"
-    mccmnc_tuple: "41539"
-  }
-}
-carrier_id {
-  canonical_id: 1595
-  carrier_name: "Telecom FL AG"
-  carrier_attribute {
-    mccmnc_tuple: "29501"
-  }
-}
-carrier_id {
-  canonical_id: 1596
-  carrier_name: "Viag Europlatform AG"
-  carrier_attribute {
-    mccmnc_tuple: "29502"
-  }
-}
-carrier_id {
-  canonical_id: 1597
-  carrier_name: "Mobilkom (Liechstein) AG"
-  carrier_attribute {
-    mccmnc_tuple: "29505"
-  }
-}
-carrier_id {
-  canonical_id: 1598
-  carrier_name: "Tele2 AG"
-  carrier_attribute {
-    mccmnc_tuple: "29577"
-  }
-}
-carrier_id {
-  canonical_id: 1599
-  carrier_name: "Dialog Sri Lanka"
-  carrier_attribute {
-    mccmnc_tuple: "41302"
-  }
-}
-carrier_id {
-  canonical_id: 1600
-  carrier_name: "Celtel Lanka Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "41303"
-  }
-}
-carrier_id {
-  canonical_id: 1601
-  carrier_name: "Comium Liberia"
-  carrier_attribute {
-    mccmnc_tuple: "61804"
-  }
-}
-carrier_id {
-  canonical_id: 1602
-  carrier_name: "Vodacom Lesotho (pty) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65101"
-    spn: "Vodacom"
-  }
-}
-carrier_id {
-  canonical_id: 1603
-  carrier_name: "Econet Ezin-cel"
-  carrier_attribute {
-    mccmnc_tuple: "65102"
-  }
-}
-carrier_id {
-  canonical_id: 1604
-  carrier_name: "MTEL d.o.o. Podgorica"
-  carrier_attribute {
-    mccmnc_tuple: "29703"
-  }
-}
-carrier_id {
-  canonical_id: 1605
-  carrier_name: "Airtel Madagascar"
-  carrier_attribute {
-    mccmnc_tuple: "64601"
-  }
-}
-carrier_id {
-  canonical_id: 1606
-  carrier_name: "Orange Madagascar"
-  carrier_attribute {
-    mccmnc_tuple: "64602"
-  }
-}
-carrier_id {
-  canonical_id: 1607
-  carrier_name: "Telecom Malagasy Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "64604"
-  }
-}
-carrier_id {
-  canonical_id: 1608
-  carrier_name: "Cosmofon"
-  carrier_attribute {
-    mccmnc_tuple: "29402"
-  }
-}
-carrier_id {
-  canonical_id: 1609
-  carrier_name: "Nov Operator"
-  carrier_attribute {
-    mccmnc_tuple: "29403"
-  }
-}
-carrier_id {
-  canonical_id: 1610
-  carrier_name: "Malitel"
-  carrier_attribute {
-    mccmnc_tuple: "61001"
-  }
-}
-carrier_id {
-  canonical_id: 1611
-  carrier_name: "Myanmar Post and Telecommunication"
-  carrier_attribute {
-    mccmnc_tuple: "41401"
-  }
-}
-carrier_id {
-  canonical_id: 1612
-  carrier_name: "Mobicom"
-  carrier_attribute {
-    mccmnc_tuple: "42899"
-  }
-}
-carrier_id {
-  canonical_id: 1613
-  carrier_name: "Smartone Mobile Communications (Macao) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "45500"
-  }
-}
-carrier_id {
-  canonical_id: 1614
-  carrier_name: "CTM"
-  carrier_attribute {
-    mccmnc_tuple: "45501"
-    mccmnc_tuple: "45504"
-  }
-}
-carrier_id {
-  canonical_id: 1615
-  carrier_name: "Hutchison Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "45503"
-  }
-}
-carrier_id {
-  canonical_id: 1616
-  carrier_name: "Mattel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "60901"
-  }
-}
-carrier_id {
-  canonical_id: 1617
-  carrier_name: "Chinguitel S.A."
-  carrier_attribute {
-    mccmnc_tuple: "60902"
-  }
-}
-carrier_id {
-  canonical_id: 1618
-  carrier_name: "Mauritel Mobiles"
-  carrier_attribute {
-    mccmnc_tuple: "60910"
-  }
-}
-carrier_id {
-  canonical_id: 1619
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "27801"
-    spn: "vodafone MT"
-  }
-}
-carrier_id {
-  canonical_id: 1620
-  carrier_name: "go mobile"
-  carrier_attribute {
-    mccmnc_tuple: "27821"
-  }
-}
-carrier_id {
-  canonical_id: 1621
-  carrier_name: "Orange Mauritius"
-  carrier_attribute {
-    mccmnc_tuple: "61701"
-  }
-}
-carrier_id {
-  canonical_id: 1622
-  carrier_name: "Mahanagar Telephone (Mauritius) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "61702"
-  }
-}
-carrier_id {
-  canonical_id: 1623
-  carrier_name: "Emtel"
-  carrier_attribute {
-    mccmnc_tuple: "61710"
-  }
-}
-carrier_id {
-  canonical_id: 1624
-  carrier_name: "DhiMobile"
-  carrier_attribute {
-    mccmnc_tuple: "47201"
-  }
-}
-carrier_id {
-  canonical_id: 1625
-  carrier_name: "Telekom Network Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "65001"
-  }
-}
-carrier_id {
-  canonical_id: 1626
-  carrier_name: "Airtel Malawi"
-  carrier_attribute {
-    mccmnc_tuple: "65010"
-  }
-}
-carrier_id {
-  canonical_id: 1627
-  carrier_name: "Art900"
-  carrier_attribute {
-    mccmnc_tuple: "50200"
-  }
-}
-carrier_id {
-  canonical_id: 1628
-  carrier_name: "Maxis/Hotlink"
-  carrier_attribute {
-    mccmnc_tuple: "50212"
-  }
-}
-carrier_id {
-  canonical_id: 1630
-  carrier_name: "Digi"
-  carrier_attribute {
-    mccmnc_tuple: "50210"
-    mccmnc_tuple: "502143"
-    mccmnc_tuple: "502146"
-    mccmnc_tuple: "50216"
-  }
-}
-carrier_id {
-  canonical_id: 1631
-  carrier_name: "TimeCel"
-  carrier_attribute {
-    mccmnc_tuple: "50217"
-  }
-}
-carrier_id {
-  canonical_id: 1632
-  carrier_name: "U Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "50218"
-  }
-}
-carrier_id {
-  canonical_id: 1633
-  carrier_name: "Celcom"
-  carrier_attribute {
-    mccmnc_tuple: "50213"
-    mccmnc_tuple: "50219"
-  }
-}
-carrier_id {
-  canonical_id: 1634
-  carrier_name: "T.D.M. GSM"
-  carrier_attribute {
-    mccmnc_tuple: "64301"
-  }
-}
-carrier_id {
-  canonical_id: 1635
-  carrier_name: "Vodacom"
-  carrier_attribute {
-    mccmnc_tuple: "64304"
-    spn: "Vodacom"
-  }
-}
-carrier_id {
-  canonical_id: 1636
-  carrier_name: "Sahel.Com"
-  carrier_attribute {
-    mccmnc_tuple: "61401"
-  }
-}
-carrier_id {
-  canonical_id: 1637
-  carrier_name: "Telecel"
-  carrier_attribute {
-    mccmnc_tuple: "61403"
-  }
-}
-carrier_id {
-  canonical_id: 1638
-  carrier_name: "Airtel Nigeria"
-  carrier_attribute {
-    mccmnc_tuple: "62120"
-  }
-}
-carrier_id {
-  canonical_id: 1639
-  carrier_name: "MTN Nigeria Communications"
-  carrier_attribute {
-    mccmnc_tuple: "62130"
-  }
-}
-carrier_id {
-  canonical_id: 1640
-  carrier_name: "Nigeria Telecommunications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "62140"
-  }
-}
-carrier_id {
-  canonical_id: 1641
-  carrier_name: "Claro NI"
-  carrier_attribute {
-    mccmnc_tuple: "71021"
-  }
-}
-carrier_id {
-  canonical_id: 1642
-  carrier_name: "Servicios de Comunicaciones, S.A. (SERCOM)"
-  carrier_attribute {
-    mccmnc_tuple: "71073"
-    mccmnc_tuple: "710730"
-  }
-}
-carrier_id {
-  canonical_id: 1644
-  carrier_name: "KPN Mobiel"
-  carrier_attribute {
-    mccmnc_tuple: "20408"
-    mccmnc_tuple: "20412"
-  }
-}
-carrier_id {
-  canonical_id: 1646
-  carrier_name: "NS Railinfrabeheer B.V."
-  carrier_attribute {
-    mccmnc_tuple: "20421"
-  }
-}
-carrier_id {
-  canonical_id: 1647
-  carrier_name: "Claro PE"
-  carrier_attribute {
-    mccmnc_tuple: "71610"
-  }
-}
-carrier_id {
-  canonical_id: 1648
-  carrier_name: "Tikiphone"
-  carrier_attribute {
-    mccmnc_tuple: "54720"
-  }
-}
-carrier_id {
-  canonical_id: 1649
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "53701"
-    mccmnc_tuple: "53702"
-  }
-}
-carrier_id {
-  canonical_id: 1651
-  carrier_name: "Digicel Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "53703"
-  }
-}
-carrier_id {
-  canonical_id: 1652
-  carrier_name: "Islacom"
-  carrier_attribute {
-    mccmnc_tuple: "51501"
-  }
-}
-carrier_id {
-  canonical_id: 1653
-  carrier_name: "Globe Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "51502"
-  }
-}
-carrier_id {
-  canonical_id: 1654
-  carrier_name: "Smart Communications"
-  carrier_attribute {
-    mccmnc_tuple: "51503"
-  }
-}
-carrier_id {
-  canonical_id: 1655
-  carrier_name: "Smart"
-  carrier_attribute {
-    mccmnc_tuple: "51503"
-    imsi_prefix_xpattern: "5150363"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "51505"
-  }
-}
-carrier_id {
-  canonical_id: 1656
-  carrier_name: "Jazz"
-  carrier_attribute {
-    mccmnc_tuple: "41001"
-    mccmnc_tuple: "41007"
-  }
-}
-carrier_id {
-  canonical_id: 1657
-  carrier_name: "PAK Telecom Mobile Ltd. (UFONE)"
-  carrier_attribute {
-    mccmnc_tuple: "41003"
-  }
-}
-carrier_id {
-  canonical_id: 1658
-  carrier_name: "Plus"
-  carrier_attribute {
-    mccmnc_tuple: "26001"
-  }
-}
-carrier_id {
-  canonical_id: 1659
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "26003"
-  }
-}
-carrier_id {
-  canonical_id: 1660
-  carrier_name: "Tele2 Polska (Tele2 Polska Sp. Z.o.o.)"
-  carrier_attribute {
-    mccmnc_tuple: "26004"
-  }
-}
-carrier_id {
-  canonical_id: 1661
-  carrier_name: "IDEA (UMTS)/PTK Centertel sp. Z.o.o."
-  carrier_attribute {
-    mccmnc_tuple: "26005"
-  }
-}
-carrier_id {
-  canonical_id: 1662
-  carrier_name: "PLAY"
-  carrier_attribute {
-    mccmnc_tuple: "26006"
-  }
-}
-carrier_id {
-  canonical_id: 1663
-  carrier_name: "Premium internet"
-  carrier_attribute {
-    mccmnc_tuple: "26007"
-  }
-}
-carrier_id {
-  canonical_id: 1664
-  carrier_name: "E-Telko"
-  carrier_attribute {
-    mccmnc_tuple: "26008"
-  }
-}
-carrier_id {
-  canonical_id: 1665
-  carrier_name: "Telekomunikacja Kolejowa (GSM-R)"
-  carrier_attribute {
-    mccmnc_tuple: "26009"
-  }
-}
-carrier_id {
-  canonical_id: 1666
-  carrier_name: "Telefony Opalenickie"
-  carrier_attribute {
-    mccmnc_tuple: "26010"
-  }
-}
-carrier_id {
-  canonical_id: 1667
-  carrier_name: "St. Pierre-et-Miquelon Télécom"
-  carrier_attribute {
-    mccmnc_tuple: "30801"
-    mccmnc_tuple: "30808"
-  }
-}
-carrier_id {
-  canonical_id: 1668
-  carrier_name: "NOS"
-  carrier_attribute {
-    mccmnc_tuple: "26803"
-    mccmnc_tuple: "26897"
-    mccmnc_tuple: "26898"
-    mccmnc_tuple: "26899"
-  }
-}
-carrier_id {
-  canonical_id: 1669
-  carrier_name: "Oniway - Inforcomunicaçôes, S.A."
-  carrier_attribute {
-    mccmnc_tuple: "26805"
-  }
-}
-carrier_id {
-  canonical_id: 1670
-  carrier_name: "MEO"
-  carrier_attribute {
-    mccmnc_tuple: "26806"
-    mccmnc_tuple: "26808"
-  }
-}
-carrier_id {
-  canonical_id: 1671
-  carrier_name: "Palau National Communications Corp. (a.k.a. PNCC)"
-  carrier_attribute {
-    mccmnc_tuple: "55201"
-  }
-}
-carrier_id {
-  canonical_id: 1672
-  carrier_name: "Hola Paraguay S.A."
-  carrier_attribute {
-    mccmnc_tuple: "74401"
-    mccmnc_tuple: "74406"
-  }
-}
-carrier_id {
-  canonical_id: 1673
-  carrier_name: "Claro PY"
-  carrier_attribute {
-    mccmnc_tuple: "74402"
-  }
-}
-carrier_id {
-  canonical_id: 1674
-  carrier_name: "Compañia Privada de Comunicaciones S.A."
-  carrier_attribute {
-    mccmnc_tuple: "74403"
-  }
-}
-carrier_id {
-  canonical_id: 1675
-  carrier_name: "Ooredoo"
-  carrier_attribute {
-    mccmnc_tuple: "42701"
-  }
-}
-carrier_id {
-  canonical_id: 1676
-  carrier_name: "Orange La Réunion"
-  carrier_attribute {
-    mccmnc_tuple: "64700"
-  }
-}
-carrier_id {
-  canonical_id: 1677
-  carrier_name: "Telco OI"
-  carrier_attribute {
-    mccmnc_tuple: "64702"
-  }
-}
-carrier_id {
-  canonical_id: 1678
-  carrier_name: "МТС"
-  carrier_attribute {
-    mccmnc_tuple: "25001"
-  }
-}
-carrier_id {
-  canonical_id: 1679
-  carrier_name: "Printelefone"
-  carrier_attribute {
-    mccmnc_tuple: "25092"
-  }
-}
-carrier_id {
-  canonical_id: 1680
-  carrier_name: "Telecom XXI"
-  carrier_attribute {
-    mccmnc_tuple: "25093"
-  }
-}
-carrier_id {
-  canonical_id: 1681
-  carrier_name: "Билайн"
-  carrier_attribute {
-    mccmnc_tuple: "25099"
-  }
-}
-carrier_id {
-  canonical_id: 1682
-  carrier_name: "MTN Rwandacell"
-  carrier_attribute {
-    mccmnc_tuple: "63510"
-  }
-}
-carrier_id {
-  canonical_id: 1683
-  carrier_name: "STC"
-  carrier_attribute {
-    mccmnc_tuple: "42001"
-  }
-}
-carrier_id {
-  canonical_id: 1684
-  carrier_name: "Mobily"
-  carrier_attribute {
-    mccmnc_tuple: "42003"
-  }
-}
-carrier_id {
-  canonical_id: 1685
-  carrier_name: "Cable & Wireless (Seychelles) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "63301"
-  }
-}
-carrier_id {
-  canonical_id: 1686
-  carrier_name: "Mediatech International Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "63302"
-  }
-}
-carrier_id {
-  canonical_id: 1687
-  carrier_name: "Airtel Seychelles"
-  carrier_attribute {
-    mccmnc_tuple: "63310"
-  }
-}
-carrier_id {
-  canonical_id: 1688
-  carrier_name: "SD Mobitel"
-  carrier_attribute {
-    mccmnc_tuple: "63401"
-  }
-}
-carrier_id {
-  canonical_id: 1689
-  carrier_name: "Areeba-Sudan"
-  carrier_attribute {
-    mccmnc_tuple: "63402"
-  }
-}
-carrier_id {
-  canonical_id: 1690
-  carrier_name: "Telia Sverige AB"
-  carrier_attribute {
-    mccmnc_tuple: "24001"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24005"
-    spn: "Telia"
-  }
-}
-carrier_id {
-  canonical_id: 1691
-  carrier_name: "3 (Hi3G Access AB)"
-  carrier_attribute {
-    mccmnc_tuple: "24002"
-  }
-}
-carrier_id {
-  canonical_id: 1692
-  carrier_name: "Nordisk Mobiltelefon AS"
-  carrier_attribute {
-    mccmnc_tuple: "24003"
-  }
-}
-carrier_id {
-  canonical_id: 1693
-  carrier_name: "3G Infrastructure Services AB"
-  carrier_attribute {
-    mccmnc_tuple: "24004"
-  }
-}
-carrier_id {
-  canonical_id: 1694
-  carrier_name: "Svenska UMTS-Nät AB"
-  carrier_attribute {
-    mccmnc_tuple: "24005"
-  }
-}
-carrier_id {
-  canonical_id: 1695
-  carrier_name: "Telenor Sverige AB"
-  carrier_attribute {
-    mccmnc_tuple: "24008"
-  }
-}
-carrier_id {
-  canonical_id: 1696
-  carrier_name: "Tele2/Comviq Sverige/Com Hem"
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24024"
-    spn: "Tele2"
-  }
-}
-carrier_id {
-  canonical_id: 1697
-  carrier_name: "Spring Mobil AB"
-  carrier_attribute {
-    mccmnc_tuple: "24010"
-  }
-}
-carrier_id {
-  canonical_id: 1698
-  carrier_name: "Linholmen Science Park AB"
-  carrier_attribute {
-    mccmnc_tuple: "24011"
-  }
-}
-carrier_id {
-  canonical_id: 1699
-  carrier_name: "Barablu Mobile Scandinavia Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "24012"
-  }
-}
-carrier_id {
-  canonical_id: 1700
-  carrier_name: "Ventelo Sverige AB"
-  carrier_attribute {
-    mccmnc_tuple: "24013"
-  }
-}
-carrier_id {
-  canonical_id: 1701
-  carrier_name: "TDC Mobil A/S"
-  carrier_attribute {
-    mccmnc_tuple: "24014"
-  }
-}
-carrier_id {
-  canonical_id: 1702
-  carrier_name: "Wireless Maingate Nordic AB"
-  carrier_attribute {
-    mccmnc_tuple: "24015"
-  }
-}
-carrier_id {
-  canonical_id: 1703
-  carrier_name: "42IT AB"
-  carrier_attribute {
-    mccmnc_tuple: "24016"
-  }
-}
-carrier_id {
-  canonical_id: 1704
-  carrier_name: "Wireless Maingate Message Services AB"
-  carrier_attribute {
-    mccmnc_tuple: "24020"
-  }
-}
-carrier_id {
-  canonical_id: 1705
-  carrier_name: "Banverket"
-  carrier_attribute {
-    mccmnc_tuple: "24021"
-  }
-}
-carrier_id {
-  canonical_id: 1706
-  carrier_name: "M1"
-  carrier_attribute {
-    mccmnc_tuple: "52503"
-  }
-}
-carrier_id {
-  canonical_id: 1707
-  carrier_name: "StarHub"
-  carrier_attribute {
-    mccmnc_tuple: "52505"
-  }
-}
-carrier_id {
-  canonical_id: 1708
-  carrier_name: "Digital Trunked Radio Network"
-  carrier_attribute {
-    mccmnc_tuple: "52512"
-  }
-}
-carrier_id {
-  canonical_id: 1709
-  carrier_name: "SI Mobil"
-  carrier_attribute {
-    mccmnc_tuple: "29340"
-  }
-}
-carrier_id {
-  canonical_id: 1710
-  carrier_name: "Telekom Slovenije"
-  carrier_attribute {
-    mccmnc_tuple: "29341"
-  }
-}
-carrier_id {
-  canonical_id: 1711
-  carrier_name: "T-2 d.o.o."
-  carrier_attribute {
-    mccmnc_tuple: "29364"
-  }
-}
-carrier_id {
-  canonical_id: 1712
-  carrier_name: "Tusmobil d.o.o."
-  carrier_attribute {
-    mccmnc_tuple: "29370"
-  }
-}
-carrier_id {
-  canonical_id: 1713
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "23101"
-    spn: "Orange"
-  }
-}
-carrier_id {
-  canonical_id: 1714
-  carrier_name: "Eurotel, UMTS"
-  carrier_attribute {
-    mccmnc_tuple: "23104"
-  }
-}
-carrier_id {
-  canonical_id: 1715
-  carrier_name: "Orange, UMTS"
-  carrier_attribute {
-    mccmnc_tuple: "23105"
-  }
-}
-carrier_id {
-  canonical_id: 1716
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "61901"
-  }
-}
-carrier_id {
-  canonical_id: 1717
-  carrier_name: "Millicom"
-  carrier_attribute {
-    mccmnc_tuple: "61902"
-  }
-}
-carrier_id {
-  canonical_id: 1718
-  carrier_name: "Africell"
-  carrier_attribute {
-    mccmnc_tuple: "61903"
-  }
-}
-carrier_id {
-  canonical_id: 1719
-  carrier_name: "Dtatel (SL) Ltd CDMA"
-  carrier_attribute {
-    mccmnc_tuple: "61950"
-  }
-}
-carrier_id {
-  canonical_id: 1720
-  carrier_name: "SMT - San  Marino Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "29201"
-  }
-}
-carrier_id {
-  canonical_id: 1721
-  carrier_name: "Orange Senegal"
-  carrier_attribute {
-    mccmnc_tuple: "60801"
-  }
-}
-carrier_id {
-  canonical_id: 1722
-  carrier_name: "Sentel GSM"
-  carrier_attribute {
-    mccmnc_tuple: "60802"
-  }
-}
-carrier_id {
-  canonical_id: 1723
-  carrier_name: "ACT Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "52015"
-  }
-}
-carrier_id {
-  canonical_id: 1724
-  carrier_name: "JC Somoncom"
-  carrier_attribute {
-    mccmnc_tuple: "43601"
-  }
-}
-carrier_id {
-  canonical_id: 1725
-  carrier_name: "CJSC Indigo Tajikistan"
-  carrier_attribute {
-    mccmnc_tuple: "43602"
-  }
-}
-carrier_id {
-  canonical_id: 1726
-  carrier_name: "TT mobile"
-  carrier_attribute {
-    mccmnc_tuple: "43603"
-  }
-}
-carrier_id {
-  canonical_id: 1727
-  carrier_name: "Josa Babilon-T"
-  carrier_attribute {
-    mccmnc_tuple: "43604"
-  }
-}
-carrier_id {
-  canonical_id: 1728
-  carrier_name: "CTJTHSC Tajik-tel"
-  carrier_attribute {
-    mccmnc_tuple: "43605"
-  }
-}
-carrier_id {
-  canonical_id: 1729
-  carrier_name: "Barash Communication Technologies (BCTI)"
-  carrier_attribute {
-    mccmnc_tuple: "43801"
-  }
-}
-carrier_id {
-  canonical_id: 1730
-  carrier_name: "TM-Cell"
-  carrier_attribute {
-    mccmnc_tuple: "43802"
-  }
-}
-carrier_id {
-  canonical_id: 1731
-  carrier_name: "Tunisie Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "60502"
-  }
-}
-carrier_id {
-  canonical_id: 1732
-  carrier_name: "Ooredoo Tunisia"
-  carrier_attribute {
-    mccmnc_tuple: "60503"
-  }
-}
-carrier_id {
-  canonical_id: 1733
-  carrier_name: "Tonga Communications Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "53901"
-  }
-}
-carrier_id {
-  canonical_id: 1734
-  carrier_name: "Shoreline Communication"
-  carrier_attribute {
-    mccmnc_tuple: "53943"
-  }
-}
-carrier_id {
-  canonical_id: 1735
-  carrier_name: "Paycell | Turkcell"
-  carrier_attribute {
-    mccmnc_tuple: "28601"
-  }
-}
-carrier_id {
-  canonical_id: 1736
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "28602"
-  }
-}
-carrier_id {
-  canonical_id: 1737
-  carrier_name: "Türk Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "28603"
-    mccmnc_tuple: "28604"
-  }
-}
-carrier_id {
-  canonical_id: 1739
-  carrier_name: "TSTT Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "37412"
-    mccmnc_tuple: "374122"
-    mccmnc_tuple: "374123"
-    mccmnc_tuple: "374124"
-    mccmnc_tuple: "374125"
-    mccmnc_tuple: "374126"
-    mccmnc_tuple: "374127"
-    mccmnc_tuple: "374128"
-    mccmnc_tuple: "374129"
-  }
-}
-carrier_id {
-  canonical_id: 1740
-  carrier_name: "Digicel Trinidad and Tobago Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "374130"
-    mccmnc_tuple: "37413"
-  }
-}
-carrier_id {
-  canonical_id: 1741
-  carrier_name: "LaqTel Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "374140"
-  }
-}
-carrier_id {
-  canonical_id: 1742
-  carrier_name: "TIGO"
-  carrier_attribute {
-    mccmnc_tuple: "64002"
-  }
-}
-carrier_id {
-  canonical_id: 1743
-  carrier_name: "Zantel"
-  carrier_attribute {
-    mccmnc_tuple: "64003"
-  }
-}
-carrier_id {
-  canonical_id: 1744
-  carrier_name: "Vodacom (T) Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "64004"
-    spn: "VodaCom Tanzania"
-  }
-}
-carrier_id {
-  canonical_id: 1745
-  carrier_name: "Airtel"
-  carrier_attribute {
-    mccmnc_tuple: "64005"
-  }
-}
-carrier_id {
-  canonical_id: 1746
-  carrier_name: "Ukrainian Mobile Communication, UMC"
-  carrier_attribute {
-    mccmnc_tuple: "25501"
-  }
-}
-carrier_id {
-  canonical_id: 1747
-  carrier_name: "Kyivstar GSM"
-  carrier_attribute {
-    mccmnc_tuple: "25503"
-  }
-}
-carrier_id {
-  canonical_id: 1748
-  carrier_name: "International Telecommunications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "25504"
-  }
-}
-carrier_id {
-  canonical_id: 1749
-  carrier_name: "Golden Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "25505"
-  }
-}
-carrier_id {
-  canonical_id: 1750
-  carrier_name: "Astelit"
-  carrier_attribute {
-    mccmnc_tuple: "25506"
-  }
-}
-carrier_id {
-  canonical_id: 1751
-  carrier_name: "Ukrtelecom"
-  carrier_attribute {
-    mccmnc_tuple: "25507"
-  }
-}
-carrier_id {
-  canonical_id: 1752
-  carrier_name: "CJSC - Telesystems of Ukraine"
-  carrier_attribute {
-    mccmnc_tuple: "25521"
-  }
-}
-carrier_id {
-  canonical_id: 1753
-  carrier_name: "Airtel Uganda"
-  carrier_attribute {
-    mccmnc_tuple: "64101"
-    mccmnc_tuple: "64122"
-  }
-}
-carrier_id {
-  canonical_id: 1754
-  carrier_name: "MTN Uganda Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "64110"
-  }
-}
-carrier_id {
-  canonical_id: 1755
-  carrier_name: "Uganda Telecom Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "64111"
-  }
-}
-carrier_id {
-  canonical_id: 1756
-  carrier_name: "House of Integrated Technology and Systems Uganda Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "64114"
-  }
-}
-carrier_id {
-  canonical_id: 1758
-  carrier_name: "ICO Global Communications"
-  carrier_attribute {
-    mccmnc_tuple: "90101"
-  }
-}
-carrier_id {
-  canonical_id: 1759
-  carrier_name: "Sense Communications International AS"
-  carrier_attribute {
-    mccmnc_tuple: "90102"
-  }
-}
-carrier_id {
-  canonical_id: 1760
-  carrier_name: "Ellipso"
-  carrier_attribute {
-    mccmnc_tuple: "90107"
-  }
-}
-carrier_id {
-  canonical_id: 1761
-  carrier_name: "Tele1 Europe"
-  carrier_attribute {
-    mccmnc_tuple: "90109"
-  }
-}
-carrier_id {
-  canonical_id: 1762
-  carrier_name: "Asia Cellular Satellite (AceS)"
-  carrier_attribute {
-    mccmnc_tuple: "90110"
-  }
-}
-carrier_id {
-  canonical_id: 1763
-  carrier_name: "Inmarsat Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "90111"
-  }
-}
-carrier_id {
-  canonical_id: 1764
-  carrier_name: "Maritime Communications Partner AS (MCP network)"
-  carrier_attribute {
-    mccmnc_tuple: "90112"
-  }
-}
-carrier_id {
-  canonical_id: 1765
-  carrier_name: "Global Networks, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "90113"
-  }
-}
-carrier_id {
-  canonical_id: 1766
-  carrier_name: "Telenor GSM - services in aircraft"
-  carrier_attribute {
-    mccmnc_tuple: "90114"
-  }
-}
-carrier_id {
-  canonical_id: 1767
-  carrier_name: "SITA GSM services in aircraft (On Air)"
-  carrier_attribute {
-    mccmnc_tuple: "90115"
-  }
-}
-carrier_id {
-  canonical_id: 1768
-  carrier_name: "Jasper Systems, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "90116"
-  }
-}
-carrier_id {
-  canonical_id: 1769
-  carrier_name: "Jersey Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "90117"
-  }
-}
-carrier_id {
-  canonical_id: 1770
-  carrier_name: "AT&T Mobility (Wireless Maritime Services)"
-  carrier_attribute {
-    mccmnc_tuple: "90118"
-  }
-}
-carrier_id {
-  canonical_id: 1771
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "90119"
-  }
-}
-carrier_id {
-  canonical_id: 1772
-  carrier_name: "Intermatica"
-  carrier_attribute {
-    mccmnc_tuple: "90120"
-  }
-}
-carrier_id {
-  canonical_id: 1773
-  carrier_name: "Seanet Maritime Communications"
-  carrier_attribute {
-    mccmnc_tuple: "90121"
-  }
-}
-carrier_id {
-  canonical_id: 1774
-  carrier_name: "Denver Consultants Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "90122"
-  }
-}
-carrier_id {
-  canonical_id: 1775
-  carrier_name: "Telecommunications for Disaster Relief (TDR) (OCHA)"
-  carrier_attribute {
-    mccmnc_tuple: "90188"
-  }
-}
-carrier_id {
-  canonical_id: 1776
-  carrier_name: "MCI"
-  carrier_attribute {
-    mccmnc_tuple: "310010"
-  }
-}
-carrier_id {
-  canonical_id: 1778
-  carrier_name: "Mobile Tel Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310013"
-  }
-}
-carrier_id {
-  canonical_id: 1779
-  carrier_name: "Cricket Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310150"
-  }
-}
-carrier_id {
-  canonical_id: 1780
-  carrier_name: "North Sight Communications Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310017"
-  }
-}
-carrier_id {
-  canonical_id: 1781
-  carrier_name: "Union Telephone Company"
-  carrier_attribute {
-    mccmnc_tuple: "310020"
-  }
-}
-carrier_id {
-  canonical_id: 1783
-  carrier_name: "Nevada Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310034"
-  }
-}
-carrier_id {
-  canonical_id: 1784
-  carrier_name: "MTA Communications dba MTA Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310040"
-  }
-}
-carrier_id {
-  canonical_id: 1785
-  carrier_name: "ACS Wireless Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310050"
-  }
-}
-carrier_id {
-  canonical_id: 1787
-  carrier_name: "Pacific Telecom Inc"
-  carrier_attribute {
-    mccmnc_tuple: "310110"
-  }
-}
-carrier_id {
-  canonical_id: 1788
-  carrier_name: "Sprint"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    mccmnc_tuple: "312530"
-  }
-}
-carrier_id {
-  canonical_id: 1789
-  carrier_name: "Carolina West Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310130"
-  }
-}
-carrier_id {
-  canonical_id: 1790
-  carrier_name: "GTA Wireless LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310140"
-  }
-}
-carrier_id {
-  canonical_id: 1792
-  carrier_name: "West Central Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310180"
-  }
-}
-carrier_id {
-  canonical_id: 1793
-  carrier_name: "Alaska Wireless Communications LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310190"
-  }
-}
-carrier_id {
-  canonical_id: 1795
-  carrier_name: "Nep Cellcorp Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310290"
-  }
-}
-carrier_id {
-  canonical_id: 1796
-  carrier_name: "Smith Bagley Inc, dba Cellular One"
-  carrier_attribute {
-    mccmnc_tuple: "310320"
-  }
-}
-carrier_id {
-  canonical_id: 1797
-  carrier_name: "AN Subsidiary LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310330"
-  }
-}
-carrier_id {
-  canonical_id: 1798
-  carrier_name: "Wireless Solutions International"
-  carrier_attribute {
-    mccmnc_tuple: "310550"
-  }
-}
-carrier_id {
-  canonical_id: 1800
-  carrier_name: "MTPCS LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310570"
-  }
-}
-carrier_id {
-  canonical_id: 1802
-  carrier_name: "cellcom"
-  carrier_attribute {
-    mccmnc_tuple: "310600"
-    gid1: "BA00040000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA00040000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311850"
-    gid1: "BA00040000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311840"
-    gid1: "c1000000"
-  }
-}
-carrier_id {
-  canonical_id: 1803
-  carrier_name: "Elkhart Telephone Co. Inc. dba Epic Touch Co."
-  carrier_attribute {
-    mccmnc_tuple: "310610"
-  }
-}
-carrier_id {
-  canonical_id: 1804
-  carrier_name: "Coleman County Telecommunications Inc. (Trans Texas PCS)"
-  carrier_attribute {
-    mccmnc_tuple: "310620"
-  }
-}
-carrier_id {
-  canonical_id: 1806
-  carrier_name: "Jasper Wireless Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310650"
-  }
-}
-carrier_id {
-  canonical_id: 1807
-  carrier_name: "AT&T Mobility Vanguard Services"
-  carrier_attribute {
-    mccmnc_tuple: "310670"
-  }
-}
-carrier_id {
-  canonical_id: 1808
-  carrier_name: "Limitless Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310690"
-  }
-}
-carrier_id {
-  canonical_id: 1809
-  carrier_name: "Cross Valiant Cellular Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "310700"
-  }
-}
-carrier_id {
-  canonical_id: 1810
-  carrier_name: "Arctic Slopo Telephone Association Cooperative"
-  carrier_attribute {
-    mccmnc_tuple: "310710"
-  }
-}
-carrier_id {
-  canonical_id: 1811
-  carrier_name: "Wireless Solutions International Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310720"
-  }
-}
-carrier_id {
-  canonical_id: 1812
-  carrier_name: "Sea Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310730"
-  }
-}
-carrier_id {
-  canonical_id: 1813
-  carrier_name: "East Kentucky Network LLC dba Appalachian Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310750"
-  }
-}
-carrier_id {
-  canonical_id: 1814
-  carrier_name: "Panhandle Telecommunications Systems Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310760"
-  }
-}
-carrier_id {
-  canonical_id: 1815
-  carrier_name: "Iowa Wireless Services LLC dba I Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310770"
-  }
-}
-carrier_id {
-  canonical_id: 1816
-  carrier_name: "Connect Net Inc"
-  carrier_attribute {
-    mccmnc_tuple: "310780"
-  }
-}
-carrier_id {
-  canonical_id: 1817
-  carrier_name: "PinPoint Communications Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310790"
-  }
-}
-carrier_id {
-  canonical_id: 1818
-  carrier_name: "Brazos Cellular Communications Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "310810"
-  }
-}
-carrier_id {
-  canonical_id: 1819
-  carrier_name: "South Canaan Cellular Communications Co. LP"
-  carrier_attribute {
-    mccmnc_tuple: "310820"
-  }
-}
-carrier_id {
-  canonical_id: 1820
-  carrier_name: "Caprock Cellular Ltd. Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "310830"
-  }
-}
-carrier_id {
-  canonical_id: 1821
-  carrier_name: "Edge Mobile LLC"
-  carrier_attribute {
-    mccmnc_tuple: "310840"
-  }
-}
-carrier_id {
-  canonical_id: 1822
-  carrier_name: "Aeris Communications, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310850"
-  }
-}
-carrier_id {
-  canonical_id: 1823
-  carrier_name: "TX RSA 15B2, LP dba Five Star Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310860"
-  }
-}
-carrier_id {
-  canonical_id: 1824
-  carrier_name: "Kaplan Telephone Company Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310870"
-  }
-}
-carrier_id {
-  canonical_id: 1825
-  carrier_name: "Advantage Cellular Systems, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310880"
-  }
-}
-carrier_id {
-  canonical_id: 1827
-  carrier_name: "Mid-Rivers"
-  carrier_attribute {
-    mccmnc_tuple: "310900"
-  }
-}
-carrier_id {
-  canonical_id: 1828
-  carrier_name: "Southern IL RSA Partnership dba First Cellular of Southern Illinois"
-  carrier_attribute {
-    mccmnc_tuple: "310910"
-  }
-}
-carrier_id {
-  canonical_id: 1829
-  carrier_name: "James Valley"
-  carrier_attribute {
-    mccmnc_tuple: "310920"
-  }
-}
-carrier_id {
-  canonical_id: 1830
-  carrier_name: "Copper Valley Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310930"
-    mccmnc_tuple: "312380"
-  }
-}
-carrier_id {
-  canonical_id: 1831
-  carrier_name: "PetroCom LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311170"
-  }
-}
-carrier_id {
-  canonical_id: 1833
-  carrier_name: "Cellular Properties Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311190"
-  }
-}
-carrier_id {
-  canonical_id: 1834
-  carrier_name: "ARINC"
-  carrier_attribute {
-    mccmnc_tuple: "311200"
-  }
-}
-carrier_id {
-  canonical_id: 1835
-  carrier_name: "Farmers Cellular Telephone"
-  carrier_attribute {
-    mccmnc_tuple: "311210"
-  }
-}
-carrier_id {
-  canonical_id: 1836
-  carrier_name: "C Spire"
-  carrier_attribute {
-    mccmnc_tuple: "311230"
-    mccmnc_tuple: "310023"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "C Spire"
-  }
-}
-carrier_id {
-  canonical_id: 1837
-  carrier_name: "Cordova Wireless Communications Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311240"
-  }
-}
-carrier_id {
-  canonical_id: 1838
-  carrier_name: "SLO Cellular Inc. dba CellularOne of San Luis Obispo"
-  carrier_attribute {
-    mccmnc_tuple: "311260"
-  }
-}
-carrier_id {
-  canonical_id: 1839
-  carrier_name: "Verizon Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    gid1: "BAE0000000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310012"
-    mccmnc_tuple: "310590"
-    mccmnc_tuple: "310591"
-    mccmnc_tuple: "310592"
-    mccmnc_tuple: "310593"
-    mccmnc_tuple: "310594"
-    mccmnc_tuple: "310595"
-    mccmnc_tuple: "310596"
-    mccmnc_tuple: "310597"
-    mccmnc_tuple: "310598"
-    mccmnc_tuple: "310599"
-    mccmnc_tuple: "310890"
-    mccmnc_tuple: "311270"
-    mccmnc_tuple: "311280"
-    mccmnc_tuple: "311281"
-    mccmnc_tuple: "311282"
-    mccmnc_tuple: "311283"
-    mccmnc_tuple: "311284"
-    mccmnc_tuple: "311285"
-    mccmnc_tuple: "311286"
-    mccmnc_tuple: "311287"
-    mccmnc_tuple: "311288"
-    mccmnc_tuple: "311289"
-    mccmnc_tuple: "311480"
-    mccmnc_tuple: "311481"
-    mccmnc_tuple: "311482"
-    mccmnc_tuple: "311483"
-    mccmnc_tuple: "311484"
-    mccmnc_tuple: "311485"
-    mccmnc_tuple: "311486"
-    mccmnc_tuple: "311487"
-    mccmnc_tuple: "311488"
-    mccmnc_tuple: "311489"
-  }
-}
-carrier_id {
-  canonical_id: 1840
-  carrier_name: "Pinpoint Wireless Inc."
-  carrier_attribute {
-    mccmnc_tuple: "311290"
-  }
-}
-carrier_id {
-  canonical_id: 1841
-  carrier_name: "Rutal Cellular Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "311300"
-  }
-}
-carrier_id {
-  canonical_id: 1842
-  carrier_name: "Leaco Rural Telephone Company Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311310"
-  }
-}
-carrier_id {
-  canonical_id: 1843
-  carrier_name: "GCI Communications Corp."
-  carrier_attribute {
-    mccmnc_tuple: "311370"
-  }
-}
-carrier_id {
-  canonical_id: 1844
-  carrier_name: "GreenFly LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311380"
-  }
-}
-carrier_id {
-  canonical_id: 1845
-  carrier_name: "Midwest Wireless Holdings LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311390"
-  }
-}
-carrier_id {
-  canonical_id: 1846
-  carrier_name: "Iowa RSA No.2 Ltd Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "311410"
-  }
-}
-carrier_id {
-  canonical_id: 1847
-  carrier_name: "northwestcell"
-  carrier_attribute {
-    mccmnc_tuple: "311420"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA00150000000000"
-  }
-}
-carrier_id {
-  canonical_id: 1848
-  carrier_name: "Chat Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "311430"
-    mccmnc_tuple: "312160"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA00130000000000"
-  }
-}
-carrier_id {
-  canonical_id: 1849
-  carrier_name: "Bluegrass Cellular LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311440"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA00010000000000"
-  }
-}
-carrier_id {
-  canonical_id: 1850
-  carrier_name: "PTCI"
-  carrier_attribute {
-    mccmnc_tuple: "311450"
-  }
-}
-carrier_id {
-  canonical_id: 1851
-  carrier_name: "Fisher Wireless Services Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311460"
-  }
-}
-carrier_id {
-  canonical_id: 1852
-  carrier_name: "Vitelcom Cellular Inc dba Innovative Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "311470"
-  }
-}
-carrier_id {
-  canonical_id: 1853
-  carrier_name: "Virgin Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    mccmnc_tuple: "312530"
-    gid1: "000003"
-  }
-}
-carrier_id {
-  canonical_id: 1854
-  carrier_name: "CTC Telecom Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311500"
-  }
-}
-carrier_id {
-  canonical_id: 1855
-  carrier_name: "Benton-Lian Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "311510"
-  }
-}
-carrier_id {
-  canonical_id: 1856
-  carrier_name: "Crossroads Wireless Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311520"
-  }
-}
-carrier_id {
-  canonical_id: 1857
-  carrier_name: "Wireless Communications Venture"
-  carrier_attribute {
-    mccmnc_tuple: "311530"
-  }
-}
-carrier_id {
-  canonical_id: 1858
-  carrier_name: "Keystone Wireless Inc"
-  carrier_attribute {
-    mccmnc_tuple: "311540"
-  }
-}
-carrier_id {
-  canonical_id: 1859
-  carrier_name: "Commnet Midwest LLC"
-  carrier_attribute {
-    mccmnc_tuple: "311550"
-  }
-}
-carrier_id {
-  canonical_id: 1860
-  carrier_name: "Nextel Communications Inc."
-  carrier_attribute {
-    mccmnc_tuple: "316010"
-  }
-}
-carrier_id {
-  canonical_id: 1861
-  carrier_name: "Southern Communications Services Inc."
-  carrier_attribute {
-    mccmnc_tuple: "316011"
-  }
-}
-carrier_id {
-  canonical_id: 1862
-  carrier_name: "Ancel"
-  carrier_attribute {
-    mccmnc_tuple: "74800"
-    mccmnc_tuple: "74801"
-    mccmnc_tuple: "74803"
-  }
-}
-carrier_id {
-  canonical_id: 1863
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "74807"
-  }
-}
-carrier_id {
-  canonical_id: 1864
-  carrier_name: "Claro UY"
-  carrier_attribute {
-    mccmnc_tuple: "74810"
-  }
-}
-carrier_id {
-  canonical_id: 1865
-  carrier_name: "Buztel"
-  carrier_attribute {
-    mccmnc_tuple: "43401"
-  }
-}
-carrier_id {
-  canonical_id: 1866
-  carrier_name: "Uzmacom"
-  carrier_attribute {
-    mccmnc_tuple: "43402"
-  }
-}
-carrier_id {
-  canonical_id: 1867
-  carrier_name: "Daewoo Unitel"
-  carrier_attribute {
-    mccmnc_tuple: "43404"
-  }
-}
-carrier_id {
-  canonical_id: 1868
-  carrier_name: "Coscom"
-  carrier_attribute {
-    mccmnc_tuple: "43405"
-  }
-}
-carrier_id {
-  canonical_id: 1869
-  carrier_name: "Uzdunrobita"
-  carrier_attribute {
-    mccmnc_tuple: "43407"
-  }
-}
-carrier_id {
-  canonical_id: 1870
-  carrier_name: "Infonet"
-  carrier_attribute {
-    mccmnc_tuple: "73401"
-  }
-}
-carrier_id {
-  canonical_id: 1871
-  carrier_name: "Corporación Digitel"
-  carrier_attribute {
-    mccmnc_tuple: "73402"
-  }
-}
-carrier_id {
-  canonical_id: 1872
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "73403"
-  }
-}
-carrier_id {
-  canonical_id: 1873
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "73404"
-  }
-}
-carrier_id {
-  canonical_id: 1874
-  carrier_name: "Telecomunicaciones Movilnet, C.A."
-  carrier_attribute {
-    mccmnc_tuple: "73406"
-  }
-}
-carrier_id {
-  canonical_id: 1875
-  carrier_name: "Caribbean Cellular Telephone, Boatphone Ltd."
-  carrier_attribute {
-    mccmnc_tuple: "348570"
-  }
-}
-carrier_id {
-  canonical_id: 1876
-  carrier_name: "GoMobile SamoaTel Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "54927"
-  }
-}
-carrier_id {
-  canonical_id: 1877
-  carrier_name: "SabaFon"
-  carrier_attribute {
-    mccmnc_tuple: "42101"
-  }
-}
-carrier_id {
-  canonical_id: 1878
-  carrier_name: "Spacetel Yemen"
-  carrier_attribute {
-    mccmnc_tuple: "42102"
-  }
-}
-carrier_id {
-  canonical_id: 1879
-  carrier_name: "Telecel"
-  carrier_attribute {
-    mccmnc_tuple: "64803"
-  }
-}
-carrier_id {
-  canonical_id: 1880
-  carrier_name: "Econet"
-  carrier_attribute {
-    mccmnc_tuple: "64804"
-  }
-}
-carrier_id {
-  canonical_id: 1881
-  carrier_name: "遠傳電信 Far EasTone Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46601"
-    mccmnc_tuple: "46602"
-    mccmnc_tuple: "46603"
-  }
-}
-carrier_id {
-  canonical_id: 1882
-  carrier_name: "遠傳電信Far EasTone Telecom(原亞太電信)"
-  carrier_attribute {
-    mccmnc_tuple: "46605"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "46601"
-    imsi_prefix_xpattern: "4660116090"
-    imsi_prefix_xpattern: "4660116091"
-  }
-}
-carrier_id {
-  canonical_id: 1883
-  carrier_name: "Tuntex Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46606"
-  }
-}
-carrier_id {
-  canonical_id: 1884
-  carrier_name: "中華電信_Chunghwa Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46611"
-    mccmnc_tuple: "46692"
-  }
-}
-carrier_id {
-  canonical_id: 1886
-  carrier_name: "台灣大哥大(原台灣之星) Taiwan Mobile Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46689"
-  }
-}
-carrier_id {
-  canonical_id: 1887
-  carrier_name: "MobiTai Communications"
-  carrier_attribute {
-    mccmnc_tuple: "46693"
-  }
-}
-carrier_id {
-  canonical_id: 1888
-  carrier_name: "台灣大哥大 Taiwan Mobile Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46697"
-  }
-}
-carrier_id {
-  canonical_id: 1889
-  carrier_name: "TransAsia Telecoms"
-  carrier_attribute {
-    mccmnc_tuple: "46699"
-  }
-}
-carrier_id {
-  canonical_id: 1890
-  carrier_name: "KT"
-  carrier_attribute {
-    mccmnc_tuple: "45002"
-    mccmnc_tuple: "45004"
-    mccmnc_tuple: "45008"
-  }
-}
-carrier_id {
-  canonical_id: 1891
-  carrier_name: "SK Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "45005"
-  }
-}
-carrier_id {
-  canonical_id: 1892
-  carrier_name: "LG U+"
-  carrier_attribute {
-    mccmnc_tuple: "45006"
-    mccmnc_tuple: "450006"
-  }
-}
-carrier_id {
-  canonical_id: 1893
-  carrier_name: "nTelos"
-  carrier_attribute {
-    mccmnc_tuple: "310470"
-  }
-}
-carrier_id {
-  canonical_id: 1894
-  carrier_name: "SoftBank"
-  carrier_attribute {
-    mccmnc_tuple: "44020"
-  }
-}
-carrier_id {
-  canonical_id: 1895
-  carrier_name: "Freedom Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302490"
-  }
-}
-carrier_id {
-  canonical_id: 1896
-  carrier_name: "dtac"
-  carrier_attribute {
-    mccmnc_tuple: "52018"
-  }
-}
-carrier_id {
-  canonical_id: 1897
-  carrier_name: "dtac "
-  carrier_attribute {
-    mccmnc_tuple: "52005"
-  }
-}
-carrier_id {
-  canonical_id: 1898
-  carrier_name: "True Move"
-  carrier_attribute {
-    mccmnc_tuple: "52099"
-  }
-}
-carrier_id {
-  canonical_id: 1899
-  carrier_name: "Viettel Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "45204"
-  }
-}
-carrier_id {
-  canonical_id: 1900
-  carrier_name: "OneCall"
-  carrier_attribute {
-    mccmnc_tuple: "24205"
-  }
-}
-carrier_id {
-  canonical_id: 1901
-  carrier_name: "Android Emulator"
-  carrier_attribute {
-    mccmnc_tuple: "310995"
-  }
-}
-carrier_id {
-  canonical_id: 1902
-  carrier_name: "Access Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "27204"
-  }
-}
-carrier_id {
-  canonical_id: 1903
-  carrier_name: "3"
-  carrier_attribute {
-    mccmnc_tuple: "27205"
-  }
-}
-carrier_id {
-  canonical_id: 1904
-  carrier_name: "DNA"
-  carrier_attribute {
-    mccmnc_tuple: "24403"
-    mccmnc_tuple: "24412"
-    mccmnc_tuple: "24413"
-  }
-}
-carrier_id {
-  canonical_id: 1905
-  carrier_name: "Nokia Test Network"
-  carrier_attribute {
-    mccmnc_tuple: "24407"
-  }
-}
-carrier_id {
-  canonical_id: 1906
-  carrier_name: "Unknown"
-  carrier_attribute {
-    mccmnc_tuple: "24408"
-  }
-}
-carrier_id {
-  canonical_id: 1907
-  carrier_name: "TDC"
-  carrier_attribute {
-    mccmnc_tuple: "24410"
-  }
-}
-carrier_id {
-  canonical_id: 1908
-  carrier_name: "Scnl Truphone"
-  carrier_attribute {
-    mccmnc_tuple: "24429"
-  }
-}
-carrier_id {
-  canonical_id: 1909
-  carrier_name: "Euskaltel"
-  carrier_attribute {
-    mccmnc_tuple: "21406"
-    mccmnc_tuple: "21408"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    imsi_prefix_xpattern: "2140359"
-  }
-}
-carrier_id {
-  canonical_id: 1910
-  carrier_name: "COX"
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA01570000000000"
-    gid2: "B100000000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311600"
-  }
-}
-carrier_id {
-  canonical_id: 1911
-  carrier_name: "Test Network, Used by GSM test equipment"
-  carrier_attribute {
-    mccmnc_tuple: "00101"
-  }
-}
-carrier_id {
-  canonical_id: 1912
-  carrier_name: "AT&T MX"
-  carrier_attribute {
-    mccmnc_tuple: "33401"
-    mccmnc_tuple: "334090"
-    mccmnc_tuple: "33409"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "22201"
-    spn: "IUSACELL"
-    spn: "UNEFON"
-  }
-}
-carrier_id {
-  canonical_id: 1913
-  carrier_name: "Telcel"
-  carrier_attribute {
-    mccmnc_tuple: "334020"
-    mccmnc_tuple: "33402"
-  }
-}
-carrier_id {
-  canonical_id: 1914
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "334030"
-    mccmnc_tuple: "33403"
-  }
-}
-carrier_id {
-  canonical_id: 1915
-  carrier_name: "AT&T MX"
-  carrier_attribute {
-    mccmnc_tuple: "334040"
-    mccmnc_tuple: "334050"
-    mccmnc_tuple: "334070"
-    mccmnc_tuple: "334080"
-  }
-}
-carrier_id {
-  canonical_id: 1916
-  carrier_name: "Dauphin Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "34080"
-  }
-}
-carrier_id {
-  canonical_id: 1917
-  carrier_name: "eMobile"
-  carrier_attribute {
-    mccmnc_tuple: "44000"
-  }
-}
-carrier_id {
-  canonical_id: 1918
-  carrier_name: "Hondutel"
-  carrier_attribute {
-    mccmnc_tuple: "70830"
-  }
-}
-carrier_id {
-  canonical_id: 1919
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "70840"
-  }
-}
-carrier_id {
-  canonical_id: 1920
-  carrier_name: "Alfa"
-  carrier_attribute {
-    mccmnc_tuple: "41501"
-  }
-}
-carrier_id {
-  canonical_id: 1921
-  carrier_name: "MTC Touch"
-  carrier_attribute {
-    mccmnc_tuple: "41503"
-  }
-}
-carrier_id {
-  canonical_id: 1922
-  carrier_name: "Ogero Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "41505"
-  }
-}
-carrier_id {
-  canonical_id: 1923
-  carrier_name: "Ncell"
-  carrier_attribute {
-    mccmnc_tuple: "42902"
-  }
-}
-carrier_id {
-  canonical_id: 1924
-  carrier_name: "Smart Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "42904"
-  }
-}
-carrier_id {
-  canonical_id: 1925
-  carrier_name: "Claro PA"
-  carrier_attribute {
-    mccmnc_tuple: "71403"
-  }
-}
-carrier_id {
-  canonical_id: 1926
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "71404"
-    mccmnc_tuple: "714040"
-  }
-}
-carrier_id {
-  canonical_id: 1927
-  carrier_name: "Telecel"
-  carrier_attribute {
-    mccmnc_tuple: "74404"
-  }
-}
-carrier_id {
-  canonical_id: 1928
-  carrier_name: "Personal"
-  carrier_attribute {
-    mccmnc_tuple: "74405"
-  }
-}
-carrier_id {
-  canonical_id: 1929
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "71606"
-  }
-}
-carrier_id {
-  canonical_id: 1930
-  carrier_name: "Entel"
-  carrier_attribute {
-    mccmnc_tuple: "71617"
-  }
-}
-carrier_id {
-  canonical_id: 1931
-  carrier_name: "Sri Lanka Telecom Mobitel"
-  carrier_attribute {
-    mccmnc_tuple: "41301"
-  }
-}
-carrier_id {
-  canonical_id: 1932
-  carrier_name: "Airtel Lanka"
-  carrier_attribute {
-    mccmnc_tuple: "41305"
-  }
-}
-carrier_id {
-  canonical_id: 1933
-  carrier_name: "Hutchison Telecommunications Lanka"
-  carrier_attribute {
-    mccmnc_tuple: "41308"
-  }
-}
-carrier_id {
-  canonical_id: 1934
-  carrier_name: "Sasatel Tanzania"
-  carrier_attribute {
-    mccmnc_tuple: "64006"
-  }
-}
-carrier_id {
-  canonical_id: 1935
-  carrier_name: "Life Tanzania"
-  carrier_attribute {
-    mccmnc_tuple: "64007"
-  }
-}
-carrier_id {
-  canonical_id: 1936
-  carrier_name: "Orange Tunisie"
-  carrier_attribute {
-    mccmnc_tuple: "60501"
-  }
-}
-carrier_id {
-  canonical_id: 1937
-  carrier_name: "ArmenTel"
-  carrier_attribute {
-    mccmnc_tuple: "28301"
-  }
-}
-carrier_id {
-  canonical_id: 1938
-  carrier_name: "Karabakh Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "28304"
-  }
-}
-carrier_id {
-  canonical_id: 1939
-  carrier_name: "K Telecom CJSC"
-  carrier_attribute {
-    mccmnc_tuple: "28305"
-  }
-}
-carrier_id {
-  canonical_id: 1940
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "28310"
-  }
-}
-carrier_id {
-  canonical_id: 1941
-  carrier_name: "Bahamas Telecommunications"
-  carrier_attribute {
-    mccmnc_tuple: "364390"
-  }
-}
-carrier_id {
-  canonical_id: 1942
-  carrier_name: "Open Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "33000"
-  }
-}
-carrier_id {
-  canonical_id: 1943
-  carrier_name: "Orange Niger"
-  carrier_attribute {
-    mccmnc_tuple: "61404"
-  }
-}
-carrier_id {
-  canonical_id: 1944
-  carrier_name: "Bell Benin Communications"
-  carrier_attribute {
-    mccmnc_tuple: "61604"
-  }
-}
-carrier_id {
-  canonical_id: 1945
-  carrier_name: "Glo Communications Benin"
-  carrier_attribute {
-    mccmnc_tuple: "61605"
-  }
-}
-carrier_id {
-  canonical_id: 1946
-  carrier_name: "Onatal (Telmob)"
-  carrier_attribute {
-    mccmnc_tuple: "61301"
-  }
-}
-carrier_id {
-  canonical_id: 1947
-  carrier_name: "Moov Togo"
-  carrier_attribute {
-    mccmnc_tuple: "61503"
-  }
-}
-carrier_id {
-  canonical_id: 1948
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "63203"
-  }
-}
-carrier_id {
-  canonical_id: 1949
-  carrier_name: "MetroPCS"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "310800"
-    mccmnc_tuple: "310660"
-    mccmnc_tuple: "310640"
-    mccmnc_tuple: "310530"
-    mccmnc_tuple: "310490"
-    mccmnc_tuple: "310310"
-    mccmnc_tuple: "310300"
-    mccmnc_tuple: "310270"
-    mccmnc_tuple: "310250"
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310230"
-    mccmnc_tuple: "310220"
-    mccmnc_tuple: "310210"
-    mccmnc_tuple: "310200"
-    mccmnc_tuple: "310160"
-    mccmnc_tuple: "311490"
-    mccmnc_tuple: "311660"
-    mccmnc_tuple: "311882"
-    mccmnc_tuple: "312250"
-    gid1: "6D38"
-  }
-}
-carrier_id {
-  canonical_id: 1950
-  carrier_name: "life:)"
-  carrier_attribute {
-    mccmnc_tuple: "25704"
-  }
-}
-carrier_id {
-  canonical_id: 1951
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "311870"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    mccmnc_tuple: "312530"
-    gid1: "000002"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "0000b0"
-    gid1: "6230"
-  }
-}
-carrier_id {
-  canonical_id: 1952
-  carrier_name: "U.S. Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "311580"
-    mccmnc_tuple: "311581"
-    mccmnc_tuple: "311582"
-    mccmnc_tuple: "311583"
-    mccmnc_tuple: "311584"
-    mccmnc_tuple: "311585"
-    mccmnc_tuple: "311586"
-    mccmnc_tuple: "311587"
-    mccmnc_tuple: "311588"
-    mccmnc_tuple: "311589"
-    mccmnc_tuple: "311220"
-    mccmnc_tuple: "311221"
-    mccmnc_tuple: "311222"
-    mccmnc_tuple: "311223"
-    mccmnc_tuple: "311224"
-    mccmnc_tuple: "311225"
-    mccmnc_tuple: "311226"
-    mccmnc_tuple: "311227"
-    mccmnc_tuple: "311228"
-    mccmnc_tuple: "311229"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "U.S. Cellular"
-  }
-}
-carrier_id {
-  canonical_id: 1953
-  carrier_name: "Claro CR"
-  carrier_attribute {
-    mccmnc_tuple: "71203"
-  }
-}
-carrier_id {
-  canonical_id: 1954
-  carrier_name: "Claro SV"
-  carrier_attribute {
-    mccmnc_tuple: "70601"
-  }
-}
-carrier_id {
-  canonical_id: 1955
-  carrier_name: "Claro PR"
-  carrier_attribute {
-    mccmnc_tuple: "330110"
-    mccmnc_tuple: "33011"
-  }
-}
-carrier_id {
-  canonical_id: 1956
-  carrier_name: "Telenor Sweden (not used)"
-  carrier_attribute {
-    mccmnc_tuple: "24009"
-  }
-}
-carrier_id {
-  canonical_id: 1957
-  carrier_name: "Bluesky"
-  carrier_attribute {
-    mccmnc_tuple: "54411"
-  }
-}
-carrier_id {
-  canonical_id: 1958
-  carrier_name: "Free"
-  carrier_attribute {
-    mccmnc_tuple: "20815"
-  }
-}
-carrier_id {
-  canonical_id: 1959
-  carrier_name: "Digi.Mobil"
-  carrier_attribute {
-    mccmnc_tuple: "22605"
-  }
-}
-carrier_id {
-  canonical_id: 1960
-  carrier_name: "Hutchison 2G"
-  carrier_attribute {
-    mccmnc_tuple: "45404"
-    mccmnc_tuple: "45405"
-  }
-}
-carrier_id {
-  canonical_id: 1961
-  carrier_name: "Airtel"
-  carrier_attribute {
-    mccmnc_tuple: "40402"
-    mccmnc_tuple: "40403"
-    mccmnc_tuple: "40410"
-    mccmnc_tuple: "40416"
-    mccmnc_tuple: "40431"
-    mccmnc_tuple: "40440"
-    mccmnc_tuple: "40445"
-    mccmnc_tuple: "40449"
-    mccmnc_tuple: "40470"
-    mccmnc_tuple: "40490"
-    mccmnc_tuple: "40492"
-    mccmnc_tuple: "40493"
-    mccmnc_tuple: "40494"
-    mccmnc_tuple: "40495"
-    mccmnc_tuple: "40496"
-    mccmnc_tuple: "40497"
-    mccmnc_tuple: "40498"
-    mccmnc_tuple: "40551"
-    mccmnc_tuple: "40552"
-    mccmnc_tuple: "40553"
-    mccmnc_tuple: "40554"
-    mccmnc_tuple: "40555"
-    mccmnc_tuple: "40556"
-  }
-}
-carrier_id {
-  canonical_id: 1962
-  carrier_name: "Fido"
-  carrier_attribute {
-    mccmnc_tuple: "302370"
-    gid1: "DD"
-  }
-}
-carrier_id {
-  canonical_id: 1963
-  carrier_name: "Vi"
-  carrier_attribute {
-    mccmnc_tuple: "40401"
-    mccmnc_tuple: "40405"
-    mccmnc_tuple: "40411"
-    mccmnc_tuple: "40413"
-    mccmnc_tuple: "40415"
-    mccmnc_tuple: "40420"
-    mccmnc_tuple: "40427"
-    mccmnc_tuple: "40430"
-    mccmnc_tuple: "40443"
-    mccmnc_tuple: "40446"
-    mccmnc_tuple: "40460"
-    mccmnc_tuple: "40484"
-    mccmnc_tuple: "40486"
-    mccmnc_tuple: "40488"
-    mccmnc_tuple: "40566"
-    mccmnc_tuple: "40567"
-    mccmnc_tuple: "405750"
-    mccmnc_tuple: "405751"
-    mccmnc_tuple: "405752"
-    mccmnc_tuple: "405753"
-    mccmnc_tuple: "405754"
-    mccmnc_tuple: "405755"
-    mccmnc_tuple: "405756"
-    spn: "Vodafone IN"
-  }
-}
-carrier_id {
-  canonical_id: 1965
-  carrier_name: "Telkom"
-  carrier_attribute {
-    mccmnc_tuple: "65502"
-  }
-}
-carrier_id {
-  canonical_id: 1966
-  carrier_name: "3"
-  carrier_attribute {
-    mccmnc_tuple: "51089"
-  }
-}
-carrier_id {
-  canonical_id: 1967
-  carrier_name: "Irancell"
-  carrier_attribute {
-    mccmnc_tuple: "43235"
-  }
-}
-carrier_id {
-  canonical_id: 1968
-  carrier_name: "Etisalat"
-  carrier_attribute {
-    mccmnc_tuple: "60203"
-  }
-}
-carrier_id {
-  canonical_id: 1969
-  carrier_name: "Asiacell"
-  carrier_attribute {
-    mccmnc_tuple: "41805"
-  }
-}
-carrier_id {
-  canonical_id: 1970
-  carrier_name: "du"
-  carrier_attribute {
-    mccmnc_tuple: "42403"
-  }
-}
-carrier_id {
-  canonical_id: 1971
-  carrier_name: "Zain Iraq"
-  carrier_attribute {
-    mccmnc_tuple: "41820"
-    mccmnc_tuple: "41830"
-  }
-}
-carrier_id {
-  canonical_id: 1972
-  carrier_name: "Zain Saudi Arabia"
-  carrier_attribute {
-    mccmnc_tuple: "42004"
-  }
-}
-carrier_id {
-  canonical_id: 1973
-  carrier_name: "Libyana"
-  carrier_attribute {
-    mccmnc_tuple: "60600"
-  }
-}
-carrier_id {
-  canonical_id: 1974
-  carrier_name: "Jazztel"
-  carrier_attribute {
-    mccmnc_tuple: "21421"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "JAZZTEL"
-    spn: "Jazztel"
-  }
-}
-carrier_id {
-  canonical_id: 1975
-  carrier_name: "Telenor"
-  carrier_attribute {
-    mccmnc_tuple: "41006"
-  }
-}
-carrier_id {
-  canonical_id: 1976
-  carrier_name: "ONO"
-  carrier_attribute {
-    mccmnc_tuple: "21418"
-  }
-}
-carrier_id {
-  canonical_id: 1977
-  carrier_name: "Ooredoo"
-  carrier_attribute {
-    mccmnc_tuple: "60303"
-  }
-}
-carrier_id {
-  canonical_id: 1978
-  carrier_name: "Smartfren"
-  carrier_attribute {
-    mccmnc_tuple: "51009"
-    mccmnc_tuple: "51028"
-  }
-}
-carrier_id {
-  canonical_id: 1979
-  carrier_name: "9Pay"
-  carrier_attribute {
-    mccmnc_tuple: "62160"
-  }
-}
-carrier_id {
-  canonical_id: 1980
-  carrier_name: "Zong"
-  carrier_attribute {
-    mccmnc_tuple: "41004"
-  }
-}
-carrier_id {
-  canonical_id: 1982
-  carrier_name: "TATA DOCOMO"
-  carrier_attribute {
-    mccmnc_tuple: "405025"
-    mccmnc_tuple: "405026"
-    mccmnc_tuple: "405027"
-    mccmnc_tuple: "405028"
-    mccmnc_tuple: "405029"
-    mccmnc_tuple: "405030"
-    mccmnc_tuple: "405031"
-    mccmnc_tuple: "405032"
-    mccmnc_tuple: "405033"
-    mccmnc_tuple: "405034"
-    mccmnc_tuple: "405035"
-    mccmnc_tuple: "405036"
-    mccmnc_tuple: "405037"
-    mccmnc_tuple: "405038"
-    mccmnc_tuple: "405039"
-    mccmnc_tuple: "405040"
-    mccmnc_tuple: "405041"
-    mccmnc_tuple: "405042"
-    mccmnc_tuple: "405043"
-    mccmnc_tuple: "405044"
-    mccmnc_tuple: "405045"
-    mccmnc_tuple: "405046"
-    mccmnc_tuple: "405047"
-  }
-}
-carrier_id {
-  canonical_id: 1983
-  carrier_name: "Korek"
-  carrier_attribute {
-    mccmnc_tuple: "41840"
-  }
-}
-carrier_id {
-  canonical_id: 1984
-  carrier_name: "Virgin"
-  carrier_attribute {
-    mccmnc_tuple: "20823"
-  }
-}
-carrier_id {
-  canonical_id: 1985
-  carrier_name: "inwi"
-  carrier_attribute {
-    mccmnc_tuple: "60402"
-  }
-}
-carrier_id {
-  canonical_id: 1986
-  carrier_name: "Tele2/Altel"
-  carrier_attribute {
-    mccmnc_tuple: "40107"
-    mccmnc_tuple: "40177"
-  }
-}
-carrier_id {
-  canonical_id: 1987
-  carrier_name: "Rightel"
-  carrier_attribute {
-    mccmnc_tuple: "43220"
-  }
-}
-carrier_id {
-  canonical_id: 1988
-  carrier_name: "O2"
-  carrier_attribute {
-    mccmnc_tuple: "23106"
-  }
-}
-carrier_id {
-  canonical_id: 1989
-  carrier_name: "Google Fi"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    gid1: "0306"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "45403"
-    gid1: "0206"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "0306"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    spn: "Fi Network"
-    spn: "nova"
-    spn: "Google Fi"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    gid1: "A00184"
-    gid1: "A00184FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    privilege_access_rule: "4C36AF4A5BDAD97C1F3D8B283416D244496C2AC5EAFE8226079EF6F676FD1859"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "312530"
-    gid1: "A00184"
-    gid1: "A00184FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    imsi_prefix_xpattern: "31026097"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4276"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "4276"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311580"
-    imsi_prefix_xpattern: "3115801"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "312580"
-    gid1: "0001"
-  }
-}
-carrier_id {
-  canonical_id: 1990
-  carrier_name: "Golan Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "42508"
-  }
-}
-carrier_id {
-  canonical_id: 1991
-  carrier_name: "Hot Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "42507"
-    mccmnc_tuple: "42577"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "HOT mobile"
-  }
-}
-carrier_id {
-  canonical_id: 1992
-  carrier_name: "STC"
-  carrier_attribute {
-    mccmnc_tuple: "41904"
-  }
-}
-carrier_id {
-  canonical_id: 1994
-  carrier_name: "Vietnamobile"
-  carrier_attribute {
-    mccmnc_tuple: "45205"
-  }
-}
-carrier_id {
-  canonical_id: 1996
-  carrier_name: "Ooredoo Myanmar"
-  carrier_attribute {
-    mccmnc_tuple: "41405"
-  }
-}
-carrier_id {
-  canonical_id: 1997
-  carrier_name: "TrueMove H 4G LTE"
-  carrier_attribute {
-    mccmnc_tuple: "52004"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "52000"
-    gid1: "01"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "52000"
-    gid1: "01FF"
-  }
-}
-carrier_id {
-  canonical_id: 1998
-  carrier_name: "Tigo"
-  carrier_attribute {
-    mccmnc_tuple: "70603"
-  }
-}
-carrier_id {
-  canonical_id: 1999
-  carrier_name: "VIVACOM"
-  carrier_attribute {
-    mccmnc_tuple: "28403"
-  }
-}
-carrier_id {
-  canonical_id: 2001
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "42702"
-    spn: "Vodafone Qatar"
-  }
-}
-carrier_id {
-  canonical_id: 2002
-  carrier_name: "Uninor"
-  carrier_attribute {
-    mccmnc_tuple: "405813"
-    mccmnc_tuple: "405814"
-    mccmnc_tuple: "405815"
-    mccmnc_tuple: "405816"
-    mccmnc_tuple: "405817"
-    mccmnc_tuple: "405818"
-    mccmnc_tuple: "405819"
-    mccmnc_tuple: "405820"
-    mccmnc_tuple: "405821"
-    mccmnc_tuple: "405822"
-    mccmnc_tuple: "405844"
-    mccmnc_tuple: "405875"
-    mccmnc_tuple: "405876"
-    mccmnc_tuple: "405877"
-    mccmnc_tuple: "405878"
-    mccmnc_tuple: "405879"
-    mccmnc_tuple: "405880"
-    mccmnc_tuple: "405925"
-    mccmnc_tuple: "405926"
-    mccmnc_tuple: "405927"
-    mccmnc_tuple: "405928"
-    mccmnc_tuple: "405929"
-  }
-}
-carrier_id {
-  canonical_id: 2003
-  carrier_name: "Liberty"
-  carrier_attribute {
-    mccmnc_tuple: "71204"
-  }
-}
-carrier_id {
-  canonical_id: 2004
-  carrier_name: "Airtel BD"
-  carrier_attribute {
-    mccmnc_tuple: "47007"
-  }
-}
-carrier_id {
-  canonical_id: 2005
-  carrier_name: "EURO INFORMATION TELECOM"
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    gid1: "4E524A31"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20801"
-    gid1: "4E524A31"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20826"
-    gid1: "4E524A31"
-  }
-}
-carrier_id {
-  canonical_id: 2006
-  carrier_name: "Madar"
-  carrier_attribute {
-    mccmnc_tuple: "60601"
-  }
-}
-carrier_id {
-  canonical_id: 2007
-  carrier_name: "Telenor Myanmar"
-  carrier_attribute {
-    mccmnc_tuple: "41406"
-  }
-}
-carrier_id {
-  canonical_id: 2008
-  carrier_name: "Videotron"
-  carrier_attribute {
-    mccmnc_tuple: "302500"
-    mccmnc_tuple: "302510"
-    mccmnc_tuple: "302520"
-  }
-}
-carrier_id {
-  canonical_id: 2009
-  carrier_name: "Movistar"
-  carrier_attribute {
-    mccmnc_tuple: "70604"
-    mccmnc_tuple: "706040"
-  }
-}
-carrier_id {
-  canonical_id: 2010
-  carrier_name: "Movistar (Telefonía Celular de Nicaragua)"
-  carrier_attribute {
-    mccmnc_tuple: "71030"
-    mccmnc_tuple: "710300"
-  }
-}
-carrier_id {
-  canonical_id: 2011
-  carrier_name: "Inland Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "310580"
-  }
-}
-carrier_id {
-  canonical_id: 2014
-  carrier_name: "Zain Bahrain"
-  carrier_attribute {
-    mccmnc_tuple: "42602"
-  }
-}
-carrier_id {
-  canonical_id: 2015
-  carrier_name: "stc BH"
-  carrier_attribute {
-    mccmnc_tuple: "42604"
-  }
-}
-carrier_id {
-  canonical_id: 2017
-  carrier_name: "Yes 5G"
-  carrier_attribute {
-    mccmnc_tuple: "502152"
-  }
-}
-carrier_id {
-  canonical_id: 2018
-  carrier_name: "Reliance Jio"
-  carrier_attribute {
-    mccmnc_tuple: "405840"
-    mccmnc_tuple: "405854"
-    mccmnc_tuple: "405855"
-    mccmnc_tuple: "405856"
-    mccmnc_tuple: "405857"
-    mccmnc_tuple: "405858"
-    mccmnc_tuple: "405859"
-    mccmnc_tuple: "405860"
-    mccmnc_tuple: "405861"
-    mccmnc_tuple: "405862"
-    mccmnc_tuple: "405863"
-    mccmnc_tuple: "405864"
-    mccmnc_tuple: "405865"
-    mccmnc_tuple: "405866"
-    mccmnc_tuple: "405867"
-    mccmnc_tuple: "405868"
-    mccmnc_tuple: "405869"
-    mccmnc_tuple: "405870"
-    mccmnc_tuple: "405871"
-    mccmnc_tuple: "405872"
-    mccmnc_tuple: "405873"
-    mccmnc_tuple: "405874"
-  }
-}
-carrier_id {
-  canonical_id: 2020
-  carrier_name: "Koodo Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "302221"
-    mccmnc_tuple: "30222"
-    mccmnc_tuple: "30286"
-    gid1: "4B4F"
-  }
-}
-carrier_id {
-  canonical_id: 2021
-  carrier_name: "Virgin Mobile Canada"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-    gid1: "3e"
-  }
-}
-carrier_id {
-  canonical_id: 2022
-  carrier_name: "TracFone"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "DDFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "311180"
-    mccmnc_tuple: "330110"
-    gid1: "DEFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "534D"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4D4B"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310590"
-    mccmnc_tuple: "310591"
-    mccmnc_tuple: "310592"
-    mccmnc_tuple: "310593"
-    mccmnc_tuple: "310594"
-    mccmnc_tuple: "310595"
-    mccmnc_tuple: "310596"
-    mccmnc_tuple: "310597"
-    mccmnc_tuple: "310598"
-    mccmnc_tuple: "310599"
-    mccmnc_tuple: "311480"
-    gid1: "BA01270000000000"
-  }
-}
-carrier_id {
-  canonical_id: 2023
-  carrier_name: "Consumer Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "2AC9"
-  }
-}
-carrier_id {
-  canonical_id: 2024
-  carrier_name: "Locus Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    gid1: "49FF"
-  }
-}
-carrier_id {
-  canonical_id: 2025
-  carrier_name: "Telrite/Pure Talk"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "62FF"
-  }
-}
-carrier_id {
-  canonical_id: 2026
-  carrier_name: "Red Pocket"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "4201"
-  }
-}
-carrier_id {
-  canonical_id: 2027
-  carrier_name: "Airvoice"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "44FF"
-  }
-}
-carrier_id {
-  canonical_id: 2028
-  carrier_name: "Ztar"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "4102"
-  }
-}
-carrier_id {
-  canonical_id: 2029
-  carrier_name: "Defense Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    gid1: "60FF"
-  }
-}
-carrier_id {
-  canonical_id: 2030
-  carrier_name: "AGMS"
-  carrier_attribute {
-    mccmnc_tuple: "310380"
-    gid1: "50FF"
-  }
-}
-carrier_id {
-  canonical_id: 2031
-  carrier_name: "Kore"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "69FF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4B4F"
-  }
-}
-carrier_id {
-  canonical_id: 2032
-  carrier_name: "Xfinity Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310590"
-    mccmnc_tuple: "310599"
-    mccmnc_tuple: "311480"
-    mccmnc_tuple: "311481"
-    mccmnc_tuple: "311482"
-    mccmnc_tuple: "311483"
-    mccmnc_tuple: "311484"
-    mccmnc_tuple: "311485"
-    mccmnc_tuple: "311486"
-    mccmnc_tuple: "311487"
-    mccmnc_tuple: "311488"
-    mccmnc_tuple: "311489"
-    gid1: "BA01450000000000"
-  }
-}
-carrier_id {
-  canonical_id: 2033
-  carrier_name: "Ooredoo"
-  carrier_attribute {
-    mccmnc_tuple: "47202"
-  }
-}
-carrier_id {
-  canonical_id: 2034
-  carrier_name: "Orange Mali"
-  carrier_attribute {
-    mccmnc_tuple: "61002"
-  }
-}
-carrier_id {
-  canonical_id: 2035
-  carrier_name: "Celcom"
-  carrier_attribute {
-    mccmnc_tuple: "61807"
-  }
-}
-carrier_id {
-  canonical_id: 2036
-  carrier_name: "Tigo"
-  carrier_attribute {
-    mccmnc_tuple: "63089"
-  }
-}
-carrier_id {
-  canonical_id: 2037
-  carrier_name: "Bite"
-  carrier_attribute {
-    mccmnc_tuple: "24705"
-  }
-}
-carrier_id {
-  canonical_id: 2038
-  carrier_name: "unifi mobile"
-  carrier_attribute {
-    mccmnc_tuple: "50211"
-    mccmnc_tuple: "502153"
-  }
-}
-carrier_id {
-  canonical_id: 2052
-  carrier_name: "Virgin"
-  carrier_attribute {
-    mccmnc_tuple: "42005"
-  }
-}
-carrier_id {
-  canonical_id: 2053
-  carrier_name: "PC mobile"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-    gid1: "40"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "302221"
-    gid1: "5043"
-  }
-}
-carrier_id {
-  canonical_id: 2054
-  carrier_name: "Solo Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-    gid1: "3f"
-  }
-}
-carrier_id {
-  canonical_id: 2055
-  carrier_name: "Chatr Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302320"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    imsi_prefix_xpattern: "302720x94"
-    imsi_prefix_xpattern: "302720x84"
-    imsi_prefix_xpattern: "302720x83"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    gid1: "d2"
-  }
-}
-carrier_id {
-  canonical_id: 2056
-  carrier_name: "Ztar Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    imsi_prefix_xpattern: "302720x98"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    gid1: "d4"
-  }
-}
-carrier_id {
-  canonical_id: 2057
-  carrier_name: "Cityfone"
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    imsi_prefix_xpattern: "302720x97"
-    gid1: "cc"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    spn: "CITYFONE"
-  }
-}
-carrier_id {
-  canonical_id: 2060
-  carrier_name: "Amaysim (MVNE2)"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "6133"
-  }
-}
-carrier_id {
-  canonical_id: 2062
-  carrier_name: "Bright Spot (Leto)"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4C45"
-  }
-}
-carrier_id {
-  canonical_id: 2064
-  carrier_name: "GoSmart"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4753"
-  }
-}
-carrier_id {
-  canonical_id: 2065
-  carrier_name: "IDT"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "AB"
-  }
-}
-carrier_id {
-  canonical_id: 2066
-  carrier_name: "Kajeet (Arterra)"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "6136"
-  }
-}
-carrier_id {
-  canonical_id: 2067
-  carrier_name: "Lyca Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "6C79"
-  }
-}
-carrier_id {
-  canonical_id: 2068
-  carrier_name: "M2M"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "3201"
-  }
-}
-carrier_id {
-  canonical_id: 2070
-  carrier_name: "Nest"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4E45"
-  }
-}
-carrier_id {
-  canonical_id: 2071
-  carrier_name: "Plintron"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "6902"
-    gid1: "7031"
-    gid1: "7032"
-  }
-}
-carrier_id {
-  canonical_id: 2073
-  carrier_name: "PWG/Cintex"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "4358"
-    gid1: "6901"
-    gid1: "6909"
-    gid1: "7531"
-  }
-}
-carrier_id {
-  canonical_id: 2074
-  carrier_name: "Ready Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "8234"
-  }
-}
-carrier_id {
-  canonical_id: 2075
-  carrier_name: "Republic Wireless (MVNE2)"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "6134"
-    gid1: "6905"
-  }
-}
-carrier_id {
-  canonical_id: 2076
-  carrier_name: "Roam Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "726D"
-    gid1: "524D"
-  }
-}
-carrier_id {
-  canonical_id: 2077
-  carrier_name: "Rock Island"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "6137"
-  }
-}
-carrier_id {
-  canonical_id: 2079
-  carrier_name: "Solavei"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "7376"
-  }
-}
-carrier_id {
-  canonical_id: 2080
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "6135"
-  }
-}
-carrier_id {
-  canonical_id: 2081
-  carrier_name: "Twilio M2M"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "7477"
-  }
-}
-carrier_id {
-  canonical_id: 2083
-  carrier_name: "Ultra/Univision"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "354D"
-    gid1: "364D"
-    gid1: "4153"
-    gid1: "4154"
-    gid1: "4155"
-    gid1: "554D"
-    gid1: "6132"
-    gid1: "6303"
-    gid1: "6903"
-    gid1: "756D"
-    gid1: "7601"
-  }
-}
-carrier_id {
-  canonical_id: 2086
-  carrier_name: "Vodafone US"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "2801"
-  }
-}
-carrier_id {
-  canonical_id: 2087
-  carrier_name: "Wyless"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "574D"
-  }
-}
-carrier_id {
-  canonical_id: 2088
-  carrier_name: "Crnogorski Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "29702"
-    spn: "Telekom.me"
-  }
-}
-carrier_id {
-  canonical_id: 2089
-  carrier_name: "Public Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "302221"
-    gid1: "4D4F"
-  }
-}
-carrier_id {
-  canonical_id: 2090
-  carrier_name: "Tbaytel"
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    imsi_prefix_xpattern: "302720x92"
-    gid1: "ba"
-  }
-}
-carrier_id {
-  canonical_id: 2091
-  carrier_name: "Bonbon"
-  carrier_attribute {
-    mccmnc_tuple: "21901"
-    mccmnc_tuple: "21920"
-    spn: "bonbon"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21901"
-    mccmnc_tuple: "21920"
-    gid1: "10"
-    gid1: "11"
-    gid1: "12"
-  }
-}
-carrier_id {
-  canonical_id: 2092
-  carrier_name: "congstar"
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    mccmnc_tuple: "26206"
-    spn: "congstar"
-    spn: "congstar.de"
-    gid1: "44"
-  }
-}
-carrier_id {
-  canonical_id: 2093
-  carrier_name: "Tesco"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    gid1: "0A"
-    gid1: "0AFFFF"
-    gid1: "0AFFFFFFFFFF544553434F202020202020202020"
-  }
-}
-carrier_id {
-  canonical_id: 2094
-  carrier_name: "tele.ring"
-  carrier_attribute {
-    mccmnc_tuple: "23207"
-    gid1: "07"
-    gid1: "FF"
-    gid1: "30"
-  }
-}
-carrier_id {
-  canonical_id: 2095
-  carrier_name: "Ben"
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    gid1: "5F"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    spn: "Ben NL"
-  }
-}
-carrier_id {
-  canonical_id: 2100
-  carrier_name: "Y!mobile"
-  carrier_attribute {
-    mccmnc_tuple: "44020"
-    gid1: "01ffff"
-    gid1: "16ffff"
-  }
-}
-carrier_id {
-  canonical_id: 2101
-  carrier_name: "BT"
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    gid1: "c3"
-    gid1: "c3ff"
-  }
-}
-carrier_id {
-  canonical_id: 2102
-  carrier_name: "BT Business"
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    gid1: "b3"
-    gid1: "b3ff"
-  }
-}
-carrier_id {
-  canonical_id: 2103
-  carrier_name: "BT One Phone"
-  carrier_attribute {
-    mccmnc_tuple: "23430"
-    mccmnc_tuple: "23408"
-    gid1: "b2"
-    gid1: "b2ff"
-  }
-}
-carrier_id {
-  canonical_id: 2105
-  carrier_name: "Skinny"
-  carrier_attribute {
-    mccmnc_tuple: "53005"
-    spn: "Skinny"
-  }
-}
-carrier_id {
-  canonical_id: 2106
-  carrier_name: "IIJmio"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "iijmio.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    preferred_apn: "iijmio.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    spn: "IIJ"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44003"
-  }
-}
-carrier_id {
-  canonical_id: 2107
-  carrier_name: "ONE"
-  carrier_attribute {
-    mccmnc_tuple: "29701"
-  }
-}
-carrier_id {
-  canonical_id: 2108
-  carrier_name: "AirtelTigo"
-  carrier_attribute {
-    mccmnc_tuple: "62003"
-    mccmnc_tuple: "62006"
-  }
-}
-carrier_id {
-  canonical_id: 2109
-  carrier_name: "Rakuten Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "rmobile.co"
-    preferred_apn: "rmobile.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    preferred_apn: "a.rmobile.jp"
-  }
-}
-carrier_id {
-  canonical_id: 2110
-  carrier_name: "UQ mobile"
-  carrier_attribute {
-    mccmnc_tuple: "44050"
-    mccmnc_tuple: "44051"
-    mccmnc_tuple: "44054"
-    gid1: "20"
-  }
-}
-carrier_id {
-  canonical_id: 2111
-  carrier_name: "Euskaltel"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    mccmnc_tuple: "21408"
-    spn: "EUSKALTEL"
-  }
-}
-carrier_id {
-  canonical_id: 2112
-  carrier_name: "Telecable"
-  carrier_attribute {
-    mccmnc_tuple: "21416"
-    spn: "telecable"
-    spn: "Telecable"
-    spn: "TeleCable"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    imsi_prefix_xpattern: "214050111"
-    spn: "telecable"
-    spn: "Telecable"
-    spn: "TeleCable"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21406"
-    imsi_prefix_xpattern: "2140613"
-    spn: "telecable"
-    spn: "Telecable"
-    spn: "TeleCable"
-  }
-}
-carrier_id {
-  canonical_id: 2113
-  carrier_name: "mobilR"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    mccmnc_tuple: "21408"
-    mccmnc_tuple: "21417"
-    spn: "mobilR"
-    spn: "mobil R"
-    spn: "Mobil R"
-  }
-}
-carrier_id {
-  canonical_id: 2114
-  carrier_name: "EWE"
-  carrier_attribute {
-    mccmnc_tuple: "26202"
-    spn: "ewe.de"
-  }
-}
-carrier_id {
-  canonical_id: 2115
-  carrier_name: "Glo"
-  carrier_attribute {
-    mccmnc_tuple: "62150"
-  }
-}
-carrier_id {
-  canonical_id: 2116
-  carrier_name: "Ratel"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "ratel.com"
-  }
-}
-carrier_id {
-  canonical_id: 2117
-  carrier_name: "TalkTalk"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    gid1: "537"
-  }
-}
-carrier_id {
-  canonical_id: 2118
-  carrier_name: "giffgaff"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    gid1: "508"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    spn: "giffgaff"
-  }
-}
-carrier_id {
-  canonical_id: 2119
-  carrier_name: "FirstNet"
-  carrier_attribute {
-    mccmnc_tuple: "313100"
-    mccmnc_tuple: "313110"
-    mccmnc_tuple: "313120"
-    mccmnc_tuple: "313130"
-    mccmnc_tuple: "313140"
-  }
-}
-carrier_id {
-  canonical_id: 2120
-  carrier_name: "FirstNet (Lab)"
-  carrier_attribute {
-    mccmnc_tuple: "312670"
-  }
-}
-carrier_id {
-  canonical_id: 2121
-  carrier_name: "mineo"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "mineo-d.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    preferred_apn: "mineo.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44020"
-    preferred_apn: "mineo-s.jp"
-  }
-}
-carrier_id {
-  canonical_id: 2122
-  carrier_name: "Lucky Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-    gid1: "42"
-  }
-}
-carrier_id {
-  canonical_id: 2123
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "54002"
-  }
-}
-carrier_id {
-  canonical_id: 2124
-  carrier_name: "Iliad"
-  carrier_attribute {
-    mccmnc_tuple: "22250"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20815"
-    gid1: "F003"
-  }
-}
-carrier_id {
-  canonical_id: 2125
-  carrier_name: "Simyo"
-  carrier_attribute {
-    mccmnc_tuple: "21419"
-    spn: "simyo"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "simyo"
-  }
-}
-carrier_id {
-  canonical_id: 2126
-  carrier_name: "Spectrum Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid1: "BA01490000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "313450"
-  }
-}
-carrier_id {
-  canonical_id: 2127
-  carrier_name: "Free RE"
-  carrier_attribute {
-    mccmnc_tuple: "64703"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20815"
-    gid1: "F2330002"
-  }
-}
-carrier_id {
-  canonical_id: 2128
-  carrier_name: "Sprint Wholesale"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    gid1: "A00022FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00305FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00209FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00250FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00207FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00105FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00181FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00263FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00271FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00151FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00058FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00301FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00143FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00247FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00274FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00042FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00092FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00312FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00050FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "A00034FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-}
-carrier_id {
-  canonical_id: 2129
-  carrier_name: "ALDI mobile"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "ALDImobile"
-  }
-}
-carrier_id {
-  canonical_id: 2130
-  carrier_name: "ALIV BS"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    imsi_prefix_xpattern: "208090021"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "36449"
-  }
-}
-carrier_id {
-  canonical_id: 2131
-  carrier_name: "Altecom"
-  carrier_attribute {
-    mccmnc_tuple: "21402"
-  }
-}
-carrier_id {
-  canonical_id: 2132
-  carrier_name: "Bics"
-  carrier_attribute {
-    mccmnc_tuple: "20628"
-    mccmnc_tuple: "90158"
-  }
-}
-carrier_id {
-  canonical_id: 2133
-  carrier_name: "Carrefour"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    imsi_prefix_xpattern: "2140352"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20801"
-    gid1: "33"
-  }
-}
-carrier_id {
-  canonical_id: 2134
-  carrier_name: "com4"
-  carrier_attribute {
-    mccmnc_tuple: "24209"
-  }
-}
-carrier_id {
-  canonical_id: 2135
-  carrier_name: "Coriolis"
-  carrier_attribute {
-    mccmnc_tuple: "20801"
-    imsi_prefix_xpattern: "208011511"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    imsi_prefix_xpattern: "208090036"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20827"
-    spn: "Coriolis"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    mccmnc_tuple: "64710"
-    gid1: "12"
-  }
-}
-carrier_id {
-  canonical_id: 2136
-  carrier_name: "Fibracat"
-  carrier_attribute {
-    mccmnc_tuple: "21402"
-    spn: "fibracat"
-  }
-}
-carrier_id {
-  canonical_id: 2137
-  carrier_name: "Gamma"
-  carrier_attribute {
-    mccmnc_tuple: "23439"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    imsi_prefix_xpattern: "240075610"
-  }
-}
-carrier_id {
-  canonical_id: 2138
-  carrier_name: "Jump"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    mccmnc_tuple: "23439"
-    mccmnc_tuple: "24007"
-    spn: "jump"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "Jump"
-  }
-}
-carrier_id {
-  canonical_id: 2139
-  carrier_name: "Sky"
-  carrier_attribute {
-    mccmnc_tuple: "23457"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "0c"
-  }
-}
-carrier_id {
-  canonical_id: 2140
-  carrier_name: "Smarty"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    gid1: "0309"
-  }
-}
-carrier_id {
-  canonical_id: 2141
-  carrier_name: "Superdrug"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    gid1: "0310"
-  }
-}
-carrier_id {
-  canonical_id: 2142
-  carrier_name: "Tinkoff"
-  carrier_attribute {
-    mccmnc_tuple: "25062"
-  }
-}
-carrier_id {
-  canonical_id: 2143
-  carrier_name: "Truphone"
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    mccmnc_tuple: "20408"
-    mccmnc_tuple: "20433"
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "20812"
-    mccmnc_tuple: "21427"
-    mccmnc_tuple: "23425"
-    mccmnc_tuple: "26033"
-    mccmnc_tuple: "26242"
-    mccmnc_tuple: "310300"
-    mccmnc_tuple: "310690"
-    mccmnc_tuple: "45400"
-    mccmnc_tuple: "45408"
-    mccmnc_tuple: "50538"
-    gid1: "547275554b3030656e"
-  }
-}
-carrier_id {
-  canonical_id: 2144
-  carrier_name: "Unleashed"
-  carrier_attribute {
-    mccmnc_tuple: "20630"
-  }
-}
-carrier_id {
-  canonical_id: 2145
-  carrier_name: "Virgin"
-  carrier_attribute {
-    mccmnc_tuple: "50502"
-    imsi_prefix_xpattern: "505029"
-  }
-}
-carrier_id {
-  canonical_id: 2146
-  carrier_name: "Visible"
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    mccmnc_tuple: "310590"
-    gid1: "bae1000000000000"
-    gid2: "1A00000000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    mccmnc_tuple: "310590"
-    gid1: "bae2000000000000"
-    gid2: "1C00000000000000"
-  }
-}
-carrier_id {
-  canonical_id: 2147
-  carrier_name: "Vodafone Lab"
-  carrier_attribute {
-    mccmnc_tuple: "26209"
-  }
-}
-carrier_id {
-  canonical_id: 2148
-  carrier_name: "BIGLOBE"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "biglobe.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    mccmnc_tuple: "44054"
-    gid1: "24"
-  }
-}
-carrier_id {
-  canonical_id: 2149
-  carrier_name: "Voiceworks NL"
-  carrier_attribute {
-    mccmnc_tuple: "20403"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20408"
-    imsi_prefix_xpattern: "204080950"
-  }
-}
-carrier_id {
-  canonical_id: 2150
-  carrier_name: "Telenet"
-  carrier_attribute {
-    mccmnc_tuple: "20605"
-  }
-}
-carrier_id {
-  canonical_id: 2151
-  carrier_name: "Legos"
-  carrier_attribute {
-    mccmnc_tuple: "20817"
-  }
-}
-carrier_id {
-  canonical_id: 2152
-  carrier_name: "Lycamobile"
-  carrier_attribute {
-    mccmnc_tuple: "23426"
-    spn: "Lycamobile"
-  }
-}
-carrier_id {
-  canonical_id: 2153
-  carrier_name: "Unité"
-  carrier_attribute {
-    mccmnc_tuple: "25905"
-  }
-}
-carrier_id {
-  canonical_id: 2154
-  carrier_name: "Tesco"
-  carrier_attribute {
-    mccmnc_tuple: "27211"
-    gid1: "0A"
-  }
-}
-carrier_id {
-  canonical_id: 2155
-  carrier_name: "Nova"
-  carrier_attribute {
-    mccmnc_tuple: "27411"
-  }
-}
-carrier_id {
-  canonical_id: 2156
-  carrier_name: "PrimeTel"
-  carrier_attribute {
-    mccmnc_tuple: "28020"
-  }
-}
-carrier_id {
-  canonical_id: 2157
-  carrier_name: "IT&E OverSeas"
-  carrier_attribute {
-    mccmnc_tuple: "310032"
-    spn: "CdmaNai"
-  }
-}
-carrier_id {
-  canonical_id: 2158
-  carrier_name: "North Dakota Network Company"
-  carrier_attribute {
-    mccmnc_tuple: "311610"
-    spn: "srtcomm"
-  }
-}
-carrier_id {
-  canonical_id: 2159
-  carrier_name: "United Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "311650"
-    spn: "unitedwireless"
-  }
-}
-carrier_id {
-  canonical_id: 2160
-  carrier_name: "Pine Belt"
-  carrier_attribute {
-    mccmnc_tuple: "311670"
-    spn: "pinebelt"
-  }
-}
-carrier_id {
-  canonical_id: 2161
-  carrier_name: "Missouri RSA No 5 Partnership"
-  carrier_attribute {
-    mccmnc_tuple: "311920"
-    spn: "CdmaNai"
-  }
-}
-carrier_id {
-  canonical_id: 2162
-  carrier_name: "Custer"
-  carrier_attribute {
-    mccmnc_tuple: "312040"
-    spn: "custer"
-  }
-}
-carrier_id {
-  canonical_id: 2163
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "36302"
-    mccmnc_tuple: "363020"
-  }
-}
-carrier_id {
-  canonical_id: 2165
-  carrier_name: "TashiCell"
-  carrier_attribute {
-    mccmnc_tuple: "40277"
-  }
-}
-carrier_id {
-  canonical_id: 2166
-  carrier_name: "SanaTel"
-  carrier_attribute {
-    mccmnc_tuple: "41808"
-  }
-}
-carrier_id {
-  canonical_id: 2167
-  carrier_name: "Omnnea"
-  carrier_attribute {
-    mccmnc_tuple: "41892"
-  }
-}
-carrier_id {
-  canonical_id: 2168
-  carrier_name: "HiTS-UNITEL"
-  carrier_attribute {
-    mccmnc_tuple: "42104"
-  }
-}
-carrier_id {
-  canonical_id: 2169
-  carrier_name: "Alon Cellular Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "42514"
-  }
-}
-carrier_id {
-  canonical_id: 2170
-  carrier_name: "Home Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "42515"
-  }
-}
-carrier_id {
-  canonical_id: 2171
-  carrier_name: "Rami Levy"
-  carrier_attribute {
-    mccmnc_tuple: "42516"
-  }
-}
-carrier_id {
-  canonical_id: 2172
-  carrier_name: "Skytel"
-  carrier_attribute {
-    mccmnc_tuple: "42891"
-  }
-}
-carrier_id {
-  canonical_id: 2173
-  carrier_name: "G.Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "42898"
-  }
-}
-carrier_id {
-  canonical_id: 2174
-  carrier_name: "Tcell"
-  carrier_attribute {
-    mccmnc_tuple: "43612"
-  }
-}
-carrier_id {
-  canonical_id: 2175
-  carrier_name: "AkTel LLC"
-  carrier_attribute {
-    mccmnc_tuple: "43703"
-  }
-}
-carrier_id {
-  canonical_id: 2176
-  carrier_name: "MegaCom"
-  carrier_attribute {
-    mccmnc_tuple: "43705"
-  }
-}
-carrier_id {
-  canonical_id: 2177
-  carrier_name: "O!"
-  carrier_attribute {
-    mccmnc_tuple: "43709"
-  }
-}
-carrier_id {
-  canonical_id: 2178
-  carrier_name: "Gmobile"
-  carrier_attribute {
-    mccmnc_tuple: "45207"
-  }
-}
-carrier_id {
-  canonical_id: 2179
-  carrier_name: "Viettel Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "45208"
-  }
-}
-carrier_id {
-  canonical_id: 2180
-  carrier_name: "qb"
-  carrier_attribute {
-    mccmnc_tuple: "45604"
-  }
-}
-carrier_id {
-  canonical_id: 2181
-  carrier_name: "Metfone"
-  carrier_attribute {
-    mccmnc_tuple: "45608"
-  }
-}
-carrier_id {
-  canonical_id: 2182
-  carrier_name: "Telkomcel"
-  carrier_attribute {
-    mccmnc_tuple: "51401"
-  }
-}
-carrier_id {
-  canonical_id: 2183
-  carrier_name: "Timor Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "51402"
-  }
-}
-carrier_id {
-  canonical_id: 2184
-  carrier_name: "Redinternet"
-  carrier_attribute {
-    mccmnc_tuple: "51518"
-  }
-}
-carrier_id {
-  canonical_id: 2185
-  carrier_name: "BREEZE"
-  carrier_attribute {
-    mccmnc_tuple: "54001"
-  }
-}
-carrier_id {
-  canonical_id: 2186
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "54202"
-  }
-}
-carrier_id {
-  canonical_id: 2187
-  carrier_name: "Kiribati Frigate"
-  carrier_attribute {
-    mccmnc_tuple: "54509"
-  }
-}
-carrier_id {
-  canonical_id: 2188
-  carrier_name: "Palau Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "55280"
-  }
-}
-carrier_id {
-  canonical_id: 2189
-  carrier_name: "Al-Jeel"
-  carrier_attribute {
-    mccmnc_tuple: "60602"
-  }
-}
-carrier_id {
-  canonical_id: 2190
-  carrier_name: "Hatef"
-  carrier_attribute {
-    mccmnc_tuple: "60606"
-  }
-}
-carrier_id {
-  canonical_id: 2191
-  carrier_name: "QCell"
-  carrier_attribute {
-    mccmnc_tuple: "60704"
-  }
-}
-carrier_id {
-  canonical_id: 2192
-  carrier_name: "Expresso"
-  carrier_attribute {
-    mccmnc_tuple: "60803"
-  }
-}
-carrier_id {
-  canonical_id: 2193
-  carrier_name: "Intercel"
-  carrier_attribute {
-    mccmnc_tuple: "61103"
-  }
-}
-carrier_id {
-  canonical_id: 2194
-  carrier_name: "Lonestar"
-  carrier_attribute {
-    mccmnc_tuple: "61801"
-  }
-}
-carrier_id {
-  canonical_id: 2195
-  carrier_name: "Libercell"
-  carrier_attribute {
-    mccmnc_tuple: "61802"
-  }
-}
-carrier_id {
-  canonical_id: 2196
-  carrier_name: "LIBTELCO"
-  carrier_attribute {
-    mccmnc_tuple: "61820"
-  }
-}
-carrier_id {
-  canonical_id: 2197
-  carrier_name: "Salam"
-  carrier_attribute {
-    mccmnc_tuple: "62204"
-  }
-}
-carrier_id {
-  canonical_id: 2198
-  carrier_name: "Nationlink"
-  carrier_attribute {
-    mccmnc_tuple: "62304"
-  }
-}
-carrier_id {
-  canonical_id: 2199
-  carrier_name: "Hits-GE"
-  carrier_attribute {
-    mccmnc_tuple: "62703"
-  }
-}
-carrier_id {
-  canonical_id: 2200
-  carrier_name: "Azur"
-  carrier_attribute {
-    mccmnc_tuple: "62804"
-  }
-}
-carrier_id {
-  canonical_id: 2201
-  carrier_name: "MOVICEL"
-  carrier_attribute {
-    mccmnc_tuple: "63104"
-  }
-}
-carrier_id {
-  canonical_id: 2202
-  carrier_name: "Sudani"
-  carrier_attribute {
-    mccmnc_tuple: "63407"
-  }
-}
-carrier_id {
-  canonical_id: 2203
-  carrier_name: "Airtel Rwanda"
-  carrier_attribute {
-    mccmnc_tuple: "63513"
-    mccmnc_tuple: "63514"
-  }
-}
-carrier_id {
-  canonical_id: 2205
-  carrier_name: "Telesom"
-  carrier_attribute {
-    mccmnc_tuple: "63701"
-  }
-}
-carrier_id {
-  canonical_id: 2206
-  carrier_name: "Nationlink"
-  carrier_attribute {
-    mccmnc_tuple: "63710"
-  }
-}
-carrier_id {
-  canonical_id: 2207
-  carrier_name: "Somtel"
-  carrier_attribute {
-    mccmnc_tuple: "63771"
-  }
-}
-carrier_id {
-  canonical_id: 2208
-  carrier_name: "Telcom"
-  carrier_attribute {
-    mccmnc_tuple: "63782"
-  }
-}
-carrier_id {
-  canonical_id: 2209
-  carrier_name: "Yu"
-  carrier_attribute {
-    mccmnc_tuple: "63905"
-  }
-}
-carrier_id {
-  canonical_id: 2210
-  carrier_name: "Telkom"
-  carrier_attribute {
-    mccmnc_tuple: "63907"
-  }
-}
-carrier_id {
-  canonical_id: 2211
-  carrier_name: "Lumitel/Viettel"
-  carrier_attribute {
-    mccmnc_tuple: "64208"
-  }
-}
-carrier_id {
-  canonical_id: 2212
-  carrier_name: "Leo"
-  carrier_attribute {
-    mccmnc_tuple: "64282"
-  }
-}
-carrier_id {
-  canonical_id: 2213
-  carrier_name: "Movitel"
-  carrier_attribute {
-    mccmnc_tuple: "64303"
-  }
-}
-carrier_id {
-  canonical_id: 2214
-  carrier_name: "switch"
-  carrier_attribute {
-    mccmnc_tuple: "64902"
-  }
-}
-carrier_id {
-  canonical_id: 2216
-  carrier_name: "VTR Banda Ancha SA"
-  carrier_attribute {
-    mccmnc_tuple: "73008"
-  }
-}
-carrier_id {
-  canonical_id: 2217
-  carrier_name: "GT&T Cellink Plus"
-  carrier_attribute {
-    mccmnc_tuple: "73802"
-    mccmnc_tuple: "738002"
-  }
-}
-carrier_id {
-  canonical_id: 2218
-  carrier_name: "ETB 4G"
-  carrier_attribute {
-    mccmnc_tuple: "732187"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "732103"
-    spn: "ETB MOVI"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "732111"
-    spn: "ETB MOVIL"
-  }
-}
-carrier_id {
-  canonical_id: 2219
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "54105"
-  }
-}
-carrier_id {
-  canonical_id: 2220
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "53988"
-  }
-}
-carrier_id {
-  canonical_id: 2221
-  carrier_name: "Etisalat"
-  carrier_attribute {
-    mccmnc_tuple: "41250"
-  }
-}
-carrier_id {
-  canonical_id: 2222
-  carrier_name: "Globacom"
-  carrier_attribute {
-    mccmnc_tuple: "62007"
-  }
-}
-carrier_id {
-  canonical_id: 2223
-  carrier_name: "Grenada:Lime"
-  carrier_attribute {
-    mccmnc_tuple: "352110"
-  }
-}
-carrier_id {
-  canonical_id: 2224
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "33818"
-    mccmnc_tuple: "338180"
-  }
-}
-carrier_id {
-  canonical_id: 2225
-  carrier_name: "MTN/Areeba"
-  carrier_attribute {
-    mccmnc_tuple: "61104"
-  }
-}
-carrier_id {
-  canonical_id: 2227
-  carrier_name: "Tigo/Milicom/Tchad Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "62203"
-  }
-}
-carrier_id {
-  canonical_id: 2229
-  carrier_name: "Rebtel"
-  carrier_attribute {
-    mccmnc_tuple: "26044"
-  }
-}
-carrier_id {
-  canonical_id: 2230
-  carrier_name: "bulsatcom"
-  carrier_attribute {
-    mccmnc_tuple: "28411"
-  }
-}
-carrier_id {
-  canonical_id: 2231
-  carrier_name: "MAX TELECOM"
-  carrier_attribute {
-    mccmnc_tuple: "28413"
-  }
-}
-carrier_id {
-  canonical_id: 2232
-  carrier_name: "BICS"
-  carrier_attribute {
-    mccmnc_tuple: "29509"
-    spn: "BICS"
-  }
-}
-carrier_id {
-  canonical_id: 2233
-  carrier_name: "EMnify"
-  carrier_attribute {
-    mccmnc_tuple: "29509"
-  }
-}
-carrier_id {
-  canonical_id: 2234
-  carrier_name: "Itisaluna"
-  carrier_attribute {
-    mccmnc_tuple: "41862"
-  }
-}
-carrier_id {
-  canonical_id: 2235
-  carrier_name: "Perfectum Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "43406"
-  }
-}
-carrier_id {
-  canonical_id: 2236
-  carrier_name: "SEATEL"
-  carrier_attribute {
-    mccmnc_tuple: "45611"
-  }
-}
-carrier_id {
-  canonical_id: 2237
-  carrier_name: "China Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46003"
-    mccmnc_tuple: "46011"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "中国电信"
-  }
-}
-carrier_id {
-  canonical_id: 2238
-  carrier_name: "Sunsurf"
-  carrier_attribute {
-    mccmnc_tuple: "52504"
-  }
-}
-carrier_id {
-  canonical_id: 2239
-  carrier_name: "AIL"
-  carrier_attribute {
-    mccmnc_tuple: "54100"
-  }
-}
-carrier_id {
-  canonical_id: 2240
-  carrier_name: "Kiribati - TSKL"
-  carrier_attribute {
-    mccmnc_tuple: "54501"
-  }
-}
-carrier_id {
-  canonical_id: 2241
-  carrier_name: "Guinetel"
-  carrier_attribute {
-    mccmnc_tuple: "63207"
-  }
-}
-carrier_id {
-  canonical_id: 2242
-  carrier_name: "Privet"
-  carrier_attribute {
-    mccmnc_tuple: "63409"
-  }
-}
-carrier_id {
-  canonical_id: 2243
-  carrier_name: "Rwandatel"
-  carrier_attribute {
-    mccmnc_tuple: "63512"
-  }
-}
-carrier_id {
-  canonical_id: 2244
-  carrier_name: "Somafone"
-  carrier_attribute {
-    mccmnc_tuple: "63704"
-  }
-}
-carrier_id {
-  canonical_id: 2245
-  carrier_name: "Hormuud"
-  carrier_attribute {
-    mccmnc_tuple: "63725"
-  }
-}
-carrier_id {
-  canonical_id: 2246
-  carrier_name: "Unitel"
-  carrier_attribute {
-    mccmnc_tuple: "63757"
-  }
-}
-carrier_id {
-  canonical_id: 2247
-  carrier_name: "Eritel"
-  carrier_attribute {
-    mccmnc_tuple: "65701"
-  }
-}
-carrier_id {
-  canonical_id: 2248
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "70804"
-    mccmnc_tuple: "708040"
-  }
-}
-carrier_id {
-  canonical_id: 2249
-  carrier_name: "Tuenti"
-  carrier_attribute {
-    mccmnc_tuple: "72201"
-    gid1: "02"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "722010"
-    spn: "Tuenti"
-    gid1: "01"
-  }
-}
-carrier_id {
-  canonical_id: 2250
-  carrier_name: "Argentina:Nuestro"
-  carrier_attribute {
-    mccmnc_tuple: "72236"
-  }
-}
-carrier_id {
-  canonical_id: 2251
-  carrier_name: "Sberbank-Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "250050"
-  }
-}
-carrier_id {
-  canonical_id: 2252
-  carrier_name: "EastLink"
-  carrier_attribute {
-    mccmnc_tuple: "302270"
-  }
-}
-carrier_id {
-  canonical_id: 2253
-  carrier_name: "ALU Test-SIM"
-  carrier_attribute {
-    mccmnc_tuple: "310028"
-  }
-}
-carrier_id {
-  canonical_id: 2254
-  carrier_name: "etex"
-  carrier_attribute {
-    mccmnc_tuple: "310035"
-    spn: "etex"
-  }
-}
-carrier_id {
-  canonical_id: 2255
-  carrier_name: "NexTech Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "311100"
-  }
-}
-carrier_id {
-  canonical_id: 2256
-  carrier_name: "TelAlaska Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "311740"
-  }
-}
-carrier_id {
-  canonical_id: 2257
-  carrier_name: "Cleartalk"
-  carrier_attribute {
-    mccmnc_tuple: "311750"
-  }
-}
-carrier_id {
-  canonical_id: 2258
-  carrier_name: "MobileNation"
-  carrier_attribute {
-    mccmnc_tuple: "311910"
-  }
-}
-carrier_id {
-  canonical_id: 2259
-  carrier_name: "Syringa"
-  carrier_attribute {
-    mccmnc_tuple: "311930"
-  }
-}
-carrier_id {
-  canonical_id: 2260
-  carrier_name: "NexTech Ota"
-  carrier_attribute {
-    mccmnc_tuple: "312420"
-  }
-}
-carrier_id {
-  canonical_id: 2261
-  carrier_name: "Blue Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "312570"
-  }
-}
-carrier_id {
-  canonical_id: 2262
-  carrier_name: "Open Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "330000"
-    spn: "openmobile"
-  }
-}
-carrier_id {
-  canonical_id: 2263
-  carrier_name: "Claro"
-  carrier_attribute {
-    mccmnc_tuple: "338070"
-  }
-}
-carrier_id {
-  canonical_id: 2264
-  carrier_name: "Videocon"
-  carrier_attribute {
-    mccmnc_tuple: "405823"
-    mccmnc_tuple: "405824"
-    mccmnc_tuple: "405825"
-    mccmnc_tuple: "405826"
-    mccmnc_tuple: "405827"
-    mccmnc_tuple: "405828"
-    mccmnc_tuple: "405829"
-    mccmnc_tuple: "405830"
-    mccmnc_tuple: "405832"
-    mccmnc_tuple: "405833"
-    mccmnc_tuple: "405834"
-    mccmnc_tuple: "405835"
-    mccmnc_tuple: "405836"
-    mccmnc_tuple: "405837"
-    mccmnc_tuple: "405838"
-    mccmnc_tuple: "405841"
-    mccmnc_tuple: "405842"
-    mccmnc_tuple: "405843"
-    mccmnc_tuple: "405932"
-  }
-}
-carrier_id {
-  canonical_id: 2265
-  carrier_name: "STEL"
-  carrier_attribute {
-    mccmnc_tuple: "405881"
-    mccmnc_tuple: "405882"
-    mccmnc_tuple: "405883"
-    mccmnc_tuple: "405884"
-    mccmnc_tuple: "405885"
-    mccmnc_tuple: "405886"
-  }
-}
-carrier_id {
-  canonical_id: 2266
-  carrier_name: "Cheers"
-  carrier_attribute {
-    mccmnc_tuple: "405912"
-    mccmnc_tuple: "405913"
-    mccmnc_tuple: "405914"
-    mccmnc_tuple: "405915"
-    mccmnc_tuple: "405916"
-    mccmnc_tuple: "405917"
-    mccmnc_tuple: "405918"
-    mccmnc_tuple: "405919"
-    mccmnc_tuple: "405920"
-    mccmnc_tuple: "405921"
-    mccmnc_tuple: "405922"
-    mccmnc_tuple: "405923"
-    mccmnc_tuple: "405930"
-  }
-}
-carrier_id {
-  canonical_id: 2267
-  carrier_name: "Tuyo"
-  carrier_attribute {
-    mccmnc_tuple: "712019"
-    mccmnc_tuple: "712190"
-  }
-}
-carrier_id {
-  canonical_id: 2268
-  carrier_name: "Viettel"
-  carrier_attribute {
-    mccmnc_tuple: "51403"
-  }
-}
-carrier_id {
-  canonical_id: 2270
-  carrier_name: "Telenet"
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    imsi_prefix_xpattern: "20601889"
-  }
-}
-carrier_id {
-  canonical_id: 2271
-  carrier_name: "Transatel"
-  carrier_attribute {
-    mccmnc_tuple: "20610"
-    spn: "BE-Transatel"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20610"
-    gid1: "BB00"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "22803"
-    spn: "CH-Transatel"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "22803"
-    gid1: "BB00"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "27077"
-    gid1: "BB00"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "27077"
-    spn: "LU-Transatel"
-  }
-}
-carrier_id {
-  canonical_id: 2272
-  carrier_name: "Auchan"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    spn: "A MOBILE"
-  }
-}
-carrier_id {
-  canonical_id: 2273
-  carrier_name: "Reglo"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    spn: "LeclercMobile"
-    spn: "RegloMobile"
-  }
-}
-carrier_id {
-  canonical_id: 2274
-  carrier_name: "La Poste"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    gid1: "4C"
-  }
-}
-carrier_id {
-  canonical_id: 2275
-  carrier_name: "Darty"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    gid1: "44"
-  }
-}
-carrier_id {
-  canonical_id: 2276
-  carrier_name: "Keyyo"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    spn: "Keyyo Mobile"
-  }
-}
-carrier_id {
-  canonical_id: 2277
-  carrier_name: "Zero forfait"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    spn: "ZERO FORFAIT"
-  }
-}
-carrier_id {
-  canonical_id: 2278
-  carrier_name: "R"
-  carrier_attribute {
-    mccmnc_tuple: "21406"
-    imsi_prefix_xpattern: "2140612"
-  }
-}
-carrier_id {
-  canonical_id: 2279
-  carrier_name: "eroskimovil"
-  carrier_attribute {
-    mccmnc_tuple: "21406"
-    imsi_prefix_xpattern: "2140606"
-  }
-}
-carrier_id {
-  canonical_id: 2282
-  carrier_name: "Noverca"
-  carrier_attribute {
-    mccmnc_tuple: "22201"
-    spn: "Noverca"
-  }
-}
-carrier_id {
-  canonical_id: 2283
-  carrier_name: "LIFE"
-  carrier_attribute {
-    mccmnc_tuple: "23433"
-    spn: "LIFE"
-  }
-}
-carrier_id {
-  canonical_id: 2284
-  carrier_name: "Telmore"
-  carrier_attribute {
-    mccmnc_tuple: "23801"
-    spn: "TELMORE"
-  }
-}
-carrier_id {
-  canonical_id: 2285
-  carrier_name: "Call Me"
-  carrier_attribute {
-    mccmnc_tuple: "23820"
-    spn: "Call me"
-  }
-}
-carrier_id {
-  canonical_id: 2286
-  carrier_name: "DLG Tele"
-  carrier_attribute {
-    mccmnc_tuple: "23820"
-    spn: "DLG Tele"
-  }
-}
-carrier_id {
-  canonical_id: 2287
-  carrier_name: "Halebop"
-  carrier_attribute {
-    mccmnc_tuple: "24001"
-    spn: "halebop"
-  }
-}
-carrier_id {
-  canonical_id: 2288
-  carrier_name: "GSC"
-  carrier_attribute {
-    mccmnc_tuple: "311590"
-    spn: "gsc"
-  }
-}
-carrier_id {
-  canonical_id: 2289
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "348170"
-  }
-}
-carrier_id {
-  canonical_id: 2290
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "366110"
-  }
-}
-carrier_id {
-  canonical_id: 2291
-  carrier_name: "Cable & Wireless West Indies Ltd (Turks & Caicos)"
-  carrier_attribute {
-    mccmnc_tuple: "376350"
-  }
-}
-carrier_id {
-  canonical_id: 2292
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "354860"
-  }
-}
-carrier_id {
-  canonical_id: 2293
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "358110"
-  }
-}
-carrier_id {
-  canonical_id: 2294
-  carrier_name: "Cable & Wireless (St. Vincent & the Grenadines) Ltd"
-  carrier_attribute {
-    mccmnc_tuple: "360110"
-  }
-}
-carrier_id {
-  canonical_id: 2295
-  carrier_name: "Cable & Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "365840"
-  }
-}
-carrier_id {
-  canonical_id: 2297
-  carrier_name: "Happy"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "Happy"
-  }
-}
-carrier_id {
-  canonical_id: 2298
-  carrier_name: "RACC"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "RACC"
-  }
-}
-carrier_id {
-  canonical_id: 2299
-  carrier_name: "CABLE movil"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "CABLE movil"
-  }
-}
-carrier_id {
-  canonical_id: 2301
-  carrier_name: "Ibercom"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-    spn: "Ibercom"
-  }
-}
-carrier_id {
-  canonical_id: 2303
-  carrier_name: "PosteMobile"
-  carrier_attribute {
-    mccmnc_tuple: "22210"
-    spn: "PosteMobile"
-  }
-}
-carrier_id {
-  canonical_id: 2304
-  carrier_name: "ERG"
-  carrier_attribute {
-    mccmnc_tuple: "22210"
-    spn: "ERG"
-  }
-}
-carrier_id {
-  canonical_id: 2308
-  carrier_name: "Sainsbury's"
-  carrier_attribute {
-    mccmnc_tuple: "23415"
-    spn: "Sainsbury's"
-  }
-}
-carrier_id {
-  canonical_id: 2309
-  carrier_name: "Lebara"
-  carrier_attribute {
-    mccmnc_tuple: "23415"
-    spn: "Lebara"
-  }
-}
-carrier_id {
-  canonical_id: 2310
-  carrier_name: "Debitel"
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    spn: "debitel"
-  }
-}
-carrier_id {
-  canonical_id: 2315
-  carrier_name: "Norvado"
-  carrier_attribute {
-    mccmnc_tuple: "311500"
-    spn: "Norvado Wireless"
-    spn: "Norvado Wireless RPA"
-    spn: "Norvado Wireless RPT"
-    spn: "Norvado Wireless RPO"
-  }
-}
-carrier_id {
-  canonical_id: 2316
-  carrier_name: "Mosaic Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "311500"
-    spn: "Mosaic RPA"
-    spn: "Mosaic Mobile"
-    spn: "Mosaic RPT"
-    spn: "Mosaic RPO"
-  }
-}
-carrier_id {
-  canonical_id: 2317
-  carrier_name: "Nemont"
-  carrier_attribute {
-    mccmnc_tuple: "311350"
-    spn: "nemont"
-  }
-}
-carrier_id {
-  canonical_id: 2318
-  carrier_name: "Bravado wireless"
-  carrier_attribute {
-    mccmnc_tuple: "311140"
-    spn: "sprocket"
-  }
-}
-carrier_id {
-  canonical_id: 2319
-  carrier_name: "Element Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "311070"
-    spn: "elementmobile"
-  }
-}
-carrier_id {
-  canonical_id: 2320
-  carrier_name: "strata"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-    spn: "strata"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "312290"
-  }
-}
-carrier_id {
-  canonical_id: 2321
-  carrier_name: "southcentral"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-    spn: "southcentral"
-  }
-}
-carrier_id {
-  canonical_id: 2322
-  carrier_name: "snakeriver"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-    spn: "snakeriver"
-  }
-}
-carrier_id {
-  canonical_id: 2323
-  carrier_name: "silverstar"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-    spn: "silverstar"
-  }
-}
-carrier_id {
-  canonical_id: 2324
-  carrier_name: "NNTC Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310960"
-    spn: "nntcwire"
-  }
-}
-carrier_id {
-  canonical_id: 2325
-  carrier_name: "Clear Sky Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310820"
-    spn: "nepa"
-  }
-}
-carrier_id {
-  canonical_id: 2326
-  carrier_name: "EMnify"
-  carrier_attribute {
-    mccmnc_tuple: "53703"
-    mccmnc_tuple: "29505"
-    spn: "EMnify"
-  }
-}
-carrier_id {
-  canonical_id: 2327
-  carrier_name: "Telemach"
-  carrier_attribute {
-    mccmnc_tuple: "29370"
-    imsi_prefix_xpattern: "29370029"
-  }
-}
-carrier_id {
-  canonical_id: 2328
-  carrier_name: "Fonic Prepaid"
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    imsi_prefix_xpattern: "26207520"
-  }
-}
-carrier_id {
-  canonical_id: 2330
-  carrier_name: "Tchibo"
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    imsi_prefix_xpattern: "26207500"
-  }
-}
-carrier_id {
-  canonical_id: 2331
-  carrier_name: "Djuice"
-  carrier_attribute {
-    mccmnc_tuple: "25503"
-    spn: "djuice"
-  }
-}
-carrier_id {
-  canonical_id: 2332
-  carrier_name: "Send"
-  carrier_attribute {
-    mccmnc_tuple: "24801"
-    imsi_prefix_xpattern: "248010x2"
-    imsi_prefix_xpattern: "248010x3"
-  }
-}
-carrier_id {
-  canonical_id: 2333
-  carrier_name: "Ventelo"
-  carrier_attribute {
-    mccmnc_tuple: "24201"
-    imsi_prefix_xpattern: "24201700"
-  }
-}
-carrier_id {
-  canonical_id: 2334
-  carrier_name: "Chess"
-  carrier_attribute {
-    mccmnc_tuple: "24202"
-    imsi_prefix_xpattern: "2420256"
-  }
-}
-carrier_id {
-  canonical_id: 2335
-  carrier_name: "Virgin"
-  carrier_attribute {
-    mccmnc_tuple: "65507"
-    imsi_prefix_xpattern: "6550710"
-  }
-}
-carrier_id {
-  canonical_id: 2337
-  carrier_name: "Movil exito"
-  carrier_attribute {
-    mccmnc_tuple: "732103"
-    mccmnc_tuple: "732111"
-    spn: "movil exito"
-  }
-}
-carrier_id {
-  canonical_id: 2338
-  carrier_name: "UNE"
-  carrier_attribute {
-    mccmnc_tuple: "732103"
-    mccmnc_tuple: "732111"
-    spn: "UNE"
-  }
-}
-carrier_id {
-  canonical_id: 2339
-  carrier_name: "Virgin Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "732123"
-    spn: "Virgin Mobile"
-  }
-}
-carrier_id {
-  canonical_id: 2340
-  carrier_name: "Google CBRS"
-  carrier_attribute {
-    mccmnc_tuple: "312580"
-  }
-}
-carrier_id {
-  canonical_id: 2345
-  carrier_name: "Mobitel"
-  carrier_attribute {
-    mccmnc_tuple: "41845"
-  }
-}
-carrier_id {
-  canonical_id: 2346
-  carrier_name: "Unitel"
-  carrier_attribute {
-    mccmnc_tuple: "45703"
-  }
-}
-carrier_id {
-  canonical_id: 2347
-  carrier_name: "Unitel"
-  carrier_attribute {
-    mccmnc_tuple: "42888"
-  }
-}
-carrier_id {
-  canonical_id: 2348
-  carrier_name: "Libya Phone"
-  carrier_attribute {
-    mccmnc_tuple: "60603"
-  }
-}
-carrier_id {
-  canonical_id: 2349
-  carrier_name: "YemenMobile"
-  carrier_attribute {
-    mccmnc_tuple: "42103"
-    mccmnc_tuple: "42111"
-    mccmnc_tuple: "42122"
-  }
-}
-carrier_id {
-  canonical_id: 2350
-  carrier_name: "B-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "52802"
-  }
-}
-carrier_id {
-  canonical_id: 2351
-  carrier_name: "AGMS"
-  carrier_attribute {
-    mccmnc_tuple: "20465"
-  }
-}
-carrier_id {
-  canonical_id: 2352
-  carrier_name: "MTCE"
-  carrier_attribute {
-    mccmnc_tuple: "43270"
-  }
-}
-carrier_id {
-  canonical_id: 2353
-  carrier_name: "SK Telink"
-  carrier_attribute {
-    mccmnc_tuple: "45011"
-  }
-}
-carrier_id {
-  canonical_id: 2354
-  carrier_name: "Smart"
-  carrier_attribute {
-    mccmnc_tuple: "70299"
-  }
-}
-carrier_id {
-  canonical_id: 2355
-  carrier_name: "Smart Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "64207"
-  }
-}
-carrier_id {
-  canonical_id: 2356
-  carrier_name: "Digicel"
-  carrier_attribute {
-    mccmnc_tuple: "34877"
-    mccmnc_tuple: "348770"
-  }
-}
-carrier_id {
-  canonical_id: 2357
-  carrier_name: "Tuenti"
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    spn: "Tuenti"
-  }
-}
-carrier_id {
-  canonical_id: 2358
-  carrier_name: "Farzanegan Pars"
-  carrier_attribute {
-    mccmnc_tuple: "43293"
-  }
-}
-carrier_id {
-  canonical_id: 2359
-  carrier_name: "Bitel"
-  carrier_attribute {
-    mccmnc_tuple: "71615"
-  }
-}
-carrier_id {
-  canonical_id: 2360
-  carrier_name: "Telefonica"
-  carrier_attribute {
-    mccmnc_tuple: "26203"
-    gid1: "010301FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "010901FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-}
-carrier_id {
-  canonical_id: 2361
-  carrier_name: "o2"
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    gid1: "010301FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-    gid1: "010901FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-}
-carrier_id {
-  canonical_id: 2362
-  carrier_name: "Vodacom"
-  carrier_attribute {
-    mccmnc_tuple: "64004"
-  }
-}
-carrier_id {
-  canonical_id: 2363
-  carrier_name: "Crnogorski Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "29702"
-  }
-}
-carrier_id {
-  canonical_id: 2364
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "53001"
-  }
-}
-carrier_id {
-  canonical_id: 2365
-  carrier_name: "Hrvatski Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "21901"
-    mccmnc_tuple: "21920"
-  }
-}
-carrier_id {
-  canonical_id: 2366
-  carrier_name: "Swisscom"
-  carrier_attribute {
-    mccmnc_tuple: "22801"
-  }
-}
-carrier_id {
-  canonical_id: 2367
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "26002"
-  }
-}
-carrier_id {
-  canonical_id: 2368
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "27801"
-  }
-}
-carrier_id {
-  canonical_id: 2369
-  carrier_name: "Orange"
-  carrier_attribute {
-    mccmnc_tuple: "21403"
-  }
-}
-carrier_id {
-  canonical_id: 2378
-  carrier_name: "Vi"
-  carrier_attribute {
-    mccmnc_tuple: "40401"
-    mccmnc_tuple: "40405"
-    mccmnc_tuple: "40411"
-    mccmnc_tuple: "40413"
-    mccmnc_tuple: "40415"
-    mccmnc_tuple: "40420"
-    mccmnc_tuple: "40427"
-    mccmnc_tuple: "40430"
-    mccmnc_tuple: "40443"
-    mccmnc_tuple: "40446"
-    mccmnc_tuple: "40460"
-    mccmnc_tuple: "40484"
-    mccmnc_tuple: "40486"
-    mccmnc_tuple: "40488"
-    mccmnc_tuple: "40566"
-    mccmnc_tuple: "40567"
-    mccmnc_tuple: "405750"
-    mccmnc_tuple: "405751"
-    mccmnc_tuple: "405752"
-    mccmnc_tuple: "405753"
-    mccmnc_tuple: "405754"
-    mccmnc_tuple: "405755"
-    mccmnc_tuple: "405756"
-  }
-}
-carrier_id {
-  canonical_id: 2380
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "60202"
-  }
-}
-carrier_id {
-  canonical_id: 2381
-  carrier_name: "Vodacom"
-  carrier_attribute {
-    mccmnc_tuple: "64304"
-  }
-}
-carrier_id {
-  canonical_id: 2383
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "62002"
-  }
-}
-carrier_id {
-  canonical_id: 2385
-  carrier_name: "Slovak Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "23102"
-  }
-}
-carrier_id {
-  canonical_id: 2386
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-  }
-}
-carrier_id {
-  canonical_id: 2387
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "27201"
-  }
-}
-carrier_id {
-  canonical_id: 2391
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "22601"
-  }
-}
-carrier_id {
-  canonical_id: 2392
-  carrier_name: "VCL"
-  carrier_attribute {
-    mccmnc_tuple: "65101"
-  }
-}
-carrier_id {
-  canonical_id: 2393
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "42702"
-  }
-}
-carrier_id {
-  canonical_id: 2394
-  carrier_name: "T-Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "23001"
-  }
-}
-carrier_id {
-  canonical_id: 2395
-  carrier_name: "Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    mccmnc_tuple: "26206"
-  }
-}
-carrier_id {
-  canonical_id: 2396
-  carrier_name: "Mkedonski Telecom AD Skopje"
-  carrier_attribute {
-    mccmnc_tuple: "29401"
-  }
-}
-carrier_id {
-  canonical_id: 2397
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "26202"
-  }
-}
-carrier_id {
-  canonical_id: 2398
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "23003"
-  }
-}
-carrier_id {
-  canonical_id: 2399
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "20205"
-  }
-}
-carrier_id {
-  canonical_id: 2401
-  carrier_name: "Magyar Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "21630"
-  }
-}
-carrier_id {
-  canonical_id: 2403
-  carrier_name: "Lycamobile"
-  carrier_attribute {
-    mccmnc_tuple: "26009"
-    spn: "Lycamobile"
-  }
-}
-carrier_id {
-  canonical_id: 2404
-  carrier_name: "Lycamobile"
-  carrier_attribute {
-    mccmnc_tuple: "23208"
-    spn: "Lycamobile"
-  }
-}
-carrier_id {
-  canonical_id: 2405
-  carrier_name: "Lycamobile"
-  carrier_attribute {
-    mccmnc_tuple: "24012"
-    spn: "Lycamobile"
-  }
-}
-carrier_id {
-  canonical_id: 2406
-  carrier_name: "Rabo Mobiel Int."
-  carrier_attribute {
-    mccmnc_tuple: "20408"
-    spn: "Rabo Mobiel"
-  }
-}
-carrier_id {
-  canonical_id: 2407
-  carrier_name: "OCN MOBILE ONE"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "lte-d.ocn.ne.jp"
-    preferred_apn: "lte.ocn.ne.jp"
-    preferred_apn: "ocn.ne.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44013"
-  }
-}
-carrier_id {
-  canonical_id: 2408
-  carrier_name: "Vmax Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "46609"
-  }
-}
-carrier_id {
-  canonical_id: 2409
-  carrier_name: "Dishnet Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "40448"
-  }
-}
-carrier_id {
-  canonical_id: 2411
-  carrier_name: "Wireless City Planning"
-  carrier_attribute {
-    mccmnc_tuple: "44100"
-  }
-}
-carrier_id {
-  canonical_id: 2412
-  carrier_name: "ACeS"
-  carrier_attribute {
-    mccmnc_tuple: "52020"
-  }
-}
-carrier_id {
-  canonical_id: 2413
-  carrier_name: "TOT"
-  carrier_attribute {
-    mccmnc_tuple: "52047"
-  }
-}
-carrier_id {
-  canonical_id: 2414
-  carrier_name: "Airtel Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "302290"
-  }
-}
-carrier_id {
-  canonical_id: 2415
-  carrier_name: "Fonyou Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "21420"
-  }
-}
-carrier_id {
-  canonical_id: 2416
-  carrier_name: "Fastweb SpA"
-  carrier_attribute {
-    mccmnc_tuple: "22208"
-  }
-}
-carrier_id {
-  canonical_id: 2417
-  carrier_name: "FIZZ"
-  carrier_attribute {
-    mccmnc_tuple: "302500"
-    gid1: "55"
-  }
-}
-carrier_id {
-  canonical_id: 2418
-  carrier_name: "TalkMobile"
-  carrier_attribute {
-    mccmnc_tuple: "23415"
-    spn: ""
-    spn: "Talkmobile"
-    gid1: "C1"
-  }
-}
-carrier_id {
-  canonical_id: 2419
-  carrier_name: "EE Business"
-  carrier_attribute {
-    mccmnc_tuple: "23433"
-    gid1: "ec"
-    gid1: "ecff"
-  }
-}
-carrier_id {
-  canonical_id: 2420
-  carrier_name: "ION Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "21434"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    imsi_prefix_xpattern: "214050104"
-  }
-}
-carrier_id {
-  canonical_id: 2421
-  carrier_name: "Testing US"
-  carrier_attribute {
-    mccmnc_tuple: "310014"
-    mccmnc_tuple: "311400"
-  }
-}
-carrier_id {
-  canonical_id: 2422
-  carrier_name: "MTX"
-  carrier_attribute {
-    mccmnc_tuple: "27002"
-  }
-}
-carrier_id {
-  canonical_id: 2423
-  carrier_name: "Plintron IT"
-  carrier_attribute {
-    mccmnc_tuple: "22254"
-    spn: "Plintron"
-  }
-}
-carrier_id {
-  canonical_id: 2424
-  carrier_name: "Plintron AT"
-  carrier_attribute {
-    mccmnc_tuple: "23222"
-    spn: "Plintron"
-  }
-}
-carrier_id {
-  canonical_id: 2425
-  carrier_name: "iD Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    gid1: "0305"
-  }
-}
-carrier_id {
-  canonical_id: 2427
-  carrier_name: "京东通信"
-  carrier_attribute {
-    mccmnc_tuple: "46000"
-    spn: "京东通信"
-  }
-}
-carrier_id {
-  canonical_id: 2428
-  carrier_name: "Telin"
-  carrier_attribute {
-    mccmnc_tuple: "45400"
-    imsi_prefix_xpattern: "454006081"
-  }
-}
-carrier_id {
-  canonical_id: 2429
-  carrier_name: "Rakuten Mobile(MNO)"
-  carrier_attribute {
-    mccmnc_tuple: "44011"
-  }
-}
-carrier_id {
-  canonical_id: 2430
-  carrier_name: "Syma Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "20801"
-    spn: "SYMA"
-  }
-}
-carrier_id {
-  canonical_id: 2432
-  carrier_name: "nuromobile"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    preferred_apn: "so-net.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    preferred_apn: "so-net.jp"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "44020"
-    preferred_apn: "so-net.jp"
-  }
-}
-carrier_id {
-  canonical_id: 2433
-  carrier_name: "Assurance Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    mccmnc_tuple: "311490"
-    mccmnc_tuple: "312530"
-    gid1: "000006"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "311490"
-    mccmnc_tuple: "311660"
-    mccmnc_tuple: "311882"
-    mccmnc_tuple: "312250"
-    gid1: "1A53"
-  }
-}
-carrier_id {
-  canonical_id: 2434
-  carrier_name: "giga_sg"
-  carrier_attribute {
-    mccmnc_tuple: "52505"
-    spn: "giga"
-  }
-}
-carrier_id {
-  canonical_id: 2435
-  carrier_name: "Xplornet"
-  carrier_attribute {
-    mccmnc_tuple: "302130"
-    mccmnc_tuple: "302131"
-  }
-}
-carrier_id {
-  canonical_id: 2436
-  carrier_name: "izi"
-  carrier_attribute {
-    mccmnc_tuple: "40101"
-    imsi_prefix_xpattern: "40101568"
-  }
-}
-carrier_id {
-  canonical_id: 2437
-  carrier_name: "Wind Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "37005"
-  }
-}
-carrier_id {
-  canonical_id: 2438
-  carrier_name: "Daily Telecom Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "22210"
-    spn: "Daily Telecom"
-  }
-}
-carrier_id {
-  canonical_id: 2439
-  carrier_name: "VERY"
-  carrier_attribute {
-    mccmnc_tuple: "22288"
-    mccmnc_tuple: "22299"
-    gid1: "0000000099"
-  }
-}
-carrier_id {
-  canonical_id: 2442
-  carrier_name: "Digi Spain"
-  carrier_attribute {
-    mccmnc_tuple: "21422"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    mccmnc_tuple: "22605"
-    gid1: "44474553"
-  }
-}
-carrier_id {
-  canonical_id: 2443
-  carrier_name: "Digi Italy"
-  carrier_attribute {
-    mccmnc_tuple: "22236"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "21405"
-    mccmnc_tuple: "22605"
-    gid1: "44474954"
-  }
-}
-carrier_id {
-  canonical_id: 2444
-  carrier_name: "Next Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "25047"
-  }
-}
-carrier_id {
-  canonical_id: 2445
-  carrier_name: "rain"
-  carrier_attribute {
-    mccmnc_tuple: "65538"
-    mccmnc_tuple: "65519"
-    mccmnc_tuple: "65573"
-    mccmnc_tuple: "65574"
-  }
-}
-carrier_id {
-  canonical_id: 2446
-  carrier_name: "Sberbank"
-  carrier_attribute {
-    mccmnc_tuple: "25050"
-  }
-}
-carrier_id {
-  canonical_id: 2447
-  carrier_name: "IDC"
-  carrier_attribute {
-    mccmnc_tuple: "25915"
-    spn: "IDC"
-  }
-}
-carrier_id {
-  canonical_id: 2448
-  carrier_name: "VTB Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "25026"
-  }
-}
-carrier_id {
-  canonical_id: 2449
-  carrier_name: "Spectrum+"
-  carrier_attribute {
-    mccmnc_tuple: "314020"
-  }
-}
-carrier_id {
-  canonical_id: 2450
-  carrier_name: "SUN Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "45400"
-    gid1: "01030000FFFFFFFF"
-  }
-}
-carrier_id {
-  canonical_id: 2451
-  carrier_name: "Tune Talk"
-  carrier_attribute {
-    mccmnc_tuple: "50219"
-    imsi_prefix_xpattern: "5021955"
-  }
-}
-carrier_id {
-  canonical_id: 2452
-  carrier_name: "WEB CoopVoce"
-  carrier_attribute {
-    mccmnc_tuple: "22253"
-  }
-}
-carrier_id {
-  canonical_id: 2453
-  carrier_name: "Connect"
-  carrier_attribute {
-    mccmnc_tuple: "41515"
-  }
-}
-carrier_id {
-  canonical_id: 2454
-  carrier_name: "Annatel"
-  carrier_attribute {
-    mccmnc_tuple: "42526"
-  }
-}
-carrier_id {
-  canonical_id: 2455
-  carrier_name: "homobile_it"
-  carrier_attribute {
-    mccmnc_tuple: "22210"
-    spn: "ho."
-  }
-}
-carrier_id {
-  canonical_id: 2457
-  carrier_name: "Nordic Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "23004"
-    imsi_prefix_xpattern: "230040"
-  }
-}
-carrier_id {
-  canonical_id: 2458
-  carrier_name: "Yota Nicaragua"
-  carrier_attribute {
-    mccmnc_tuple: "71070"
-  }
-}
-carrier_id {
-  canonical_id: 2459
-  carrier_name: "GigSky"
-  carrier_attribute {
-    mccmnc_tuple: "312870"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "22201"
-    spn: "GigSky"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310380"
-    imsi_prefix_xpattern: "3103805"
-    spn: "GigSky"
-    gid1: "6F"
-    gid1: "6E"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23801"
-    imsi_prefix_xpattern: "23801395"
-    spn: "GigSky"
-    gid1: "6F"
-    gid1: "6E"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    imsi_prefix_xpattern: "240075614"
-    spn: "GigSky"
-    gid1: "6F"
-    gid1: "6E"
-  }
-}
-carrier_id {
-  canonical_id: 2460
-  carrier_name: "Shaw Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302490"
-    imsi_prefix_xpattern: "3024904"
-    gid1: "53"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302490"
-    imsi_prefix_xpattern: "3024905"
-    gid1: "53"
-  }
-}
-carrier_id {
-  canonical_id: 2461
-  carrier_name: "Voiceworks DE"
-  carrier_attribute {
-    mccmnc_tuple: "26220"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26203"
-    imsi_prefix_xpattern: "26203483"
-  }
-}
-carrier_id {
-  canonical_id: 2463
-  carrier_name: "SevenNet Layers"
-  carrier_attribute {
-    mccmnc_tuple: "41877"
-  }
-}
-carrier_id {
-  canonical_id: 2464
-  carrier_name: "Mobi"
-  carrier_attribute {
-    mccmnc_tuple: "313460"
-  }
-}
-carrier_id {
-  canonical_id: 2467
-  carrier_name: "Emergency Services Network"
-  carrier_attribute {
-    mccmnc_tuple: "23471"
-  }
-}
-carrier_id {
-  canonical_id: 2468
-  carrier_name: "Tele2"
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    gid1: "8F"
-    gid1: "4E4C"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    spn: "Tele2 NL"
-  }
-}
-carrier_id {
-  canonical_id: 2469
-  carrier_name: "ALTAN - Internal Use"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-  }
-}
-carrier_id {
-  canonical_id: 2470
-  carrier_name: "ALTAN - IENTC"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "IENTC"
-  }
-}
-carrier_id {
-  canonical_id: 2471
-  carrier_name: "ALTAN - NeWWW"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "NeWWW"
-  }
-}
-carrier_id {
-  canonical_id: 2472
-  carrier_name: "Travelfy"
-  carrier_attribute {
-    mccmnc_tuple: "52505"
-    imsi_prefix_xpattern: "5250530996"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    imsi_prefix_xpattern: "2341040991"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "732123"
-    imsi_prefix_xpattern: "7321232010"
-  }
-}
-carrier_id {
-  canonical_id: 2473
-  carrier_name: "MEGACABLE"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "Mega4.5 G"
-  }
-}
-carrier_id {
-  canonical_id: 2474
-  carrier_name: "NETWEY"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "NETWEY"
-  }
-}
-carrier_id {
-  canonical_id: 2475
-  carrier_name: "RETEMEX"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "RETEMEX"
-  }
-}
-carrier_id {
-  canonical_id: 2476
-  carrier_name: "WALMART"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "BAIT"
-  }
-}
-carrier_id {
-  canonical_id: 2477
-  carrier_name: "IUSACOMM"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "IUSATEL"
-  }
-}
-carrier_id {
-  canonical_id: 2478
-  carrier_name: "CFE"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "CFE TEIPT"
-  }
-}
-carrier_id {
-  canonical_id: 2479
-  carrier_name: "INTEN"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "INTEN"
-  }
-}
-carrier_id {
-  canonical_id: 2480
-  carrier_name: "DIVERACY"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "NEMI"
-  }
-}
-carrier_id {
-  canonical_id: 2481
-  carrier_name: "DIRI"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "DIRI"
-  }
-}
-carrier_id {
-  canonical_id: 2482
-  carrier_name: "TOPOS"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "TURBORED"
-  }
-}
-carrier_id {
-  canonical_id: 2483
-  carrier_name: "GURUWEB"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "Gurucomm"
-  }
-}
-carrier_id {
-  canonical_id: 2484
-  carrier_name: "UBIX"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "Ubix"
-  }
-}
-carrier_id {
-  canonical_id: 2485
-  carrier_name: "ROCKETEL"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "PagaPhone"
-  }
-}
-carrier_id {
-  canonical_id: 2486
-  carrier_name: "Redpotencia"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "Redpotencia"
-  }
-}
-carrier_id {
-  canonical_id: 2487
-  carrier_name: "ADDINTELI"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "CHAMO-MOVIL"
-    spn: "BYPLUS"
-  }
-}
-carrier_id {
-  canonical_id: 2488
-  carrier_name: "IZZI"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "izzi"
-  }
-}
-carrier_id {
-  canonical_id: 2489
-  carrier_name: "ADM"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "MISTRAL"
-  }
-}
-carrier_id {
-  canonical_id: 2490
-  carrier_name: "ADS"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "MEXFON"
-  }
-}
-carrier_id {
-  canonical_id: 2491
-  carrier_name: "YONDER"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "YO"
-  }
-}
-carrier_id {
-  canonical_id: 2492
-  carrier_name: "Arlonet"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "Arlonet"
-  }
-}
-carrier_id {
-  canonical_id: 2493
-  carrier_name: "TRIDEX"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "VALOR"
-  }
-}
-carrier_id {
-  canonical_id: 2494
-  carrier_name: "WiMO"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "WiMO"
-  }
-}
-carrier_id {
-  canonical_id: 2495
-  carrier_name: "OUI"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "OUI"
-  }
-}
-carrier_id {
-  canonical_id: 2496
-  carrier_name: "FREEDOMPOP"
-  carrier_attribute {
-    mccmnc_tuple: "334140"
-    spn: "FreedomPop"
-  }
-}
-carrier_id {
-  canonical_id: 2497
-  carrier_name: "Vodafone GDSP"
-  carrier_attribute {
-    mccmnc_tuple: "90128"
-  }
-}
-carrier_id {
-  canonical_id: 2498
-  carrier_name: "Optimum"
-  carrier_attribute {
-    mccmnc_tuple: "313390"
-  }
-}
-carrier_id {
-  canonical_id: 2499
-  carrier_name: "Belong"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Belong"
-  }
-}
-carrier_id {
-  canonical_id: 2500
-  carrier_name: "Telechoice"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "TeleChoice"
-  }
-}
-carrier_id {
-  canonical_id: 2501
-  carrier_name: "Woolworths"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Woolworths"
-  }
-}
-carrier_id {
-  canonical_id: 2502
-  carrier_name: "NuMobile"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "nu mobile"
-  }
-}
-carrier_id {
-  canonical_id: 2503
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "BOOST"
-    spn: "Boost"
-  }
-}
-carrier_id {
-  canonical_id: 2504
-  carrier_name: "Liberty Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "313790"
-  }
-}
-carrier_id {
-  canonical_id: 2505
-  carrier_name: "OptimERA Wireless"
-  carrier_attribute {
-    mccmnc_tuple: "313380"
-    spn: "OptimERA"
-  }
-}
-carrier_id {
-  canonical_id: 2506
-  carrier_name: "Alestra Servicios Moviles"
-  carrier_attribute {
-    mccmnc_tuple: "334130"
-  }
-}
-carrier_id {
-  canonical_id: 2507
-  carrier_name: "UPC"
-  carrier_attribute {
-    mccmnc_tuple: "22853"
-    gid1: "75636831FFFFFFFFFF"
-  }
-}
-carrier_id {
-  canonical_id: 2508
-  carrier_name: "Virgin Media Ireland"
-  carrier_attribute {
-    mccmnc_tuple: "27215"
-    gid1: "75696531FFFFFFFFFF"
-    gid2: "75696532FFFFFFFFFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    imsi_prefix_xpattern: "206018016"
-  }
-}
-carrier_id {
-  canonical_id: 2509
-  carrier_name: "Evolve"
-  carrier_attribute {
-    mccmnc_tuple: "310990"
-  }
-}
-carrier_id {
-  canonical_id: 2510
-  carrier_name: "Melita"
-  carrier_attribute {
-    mccmnc_tuple: "27877"
-  }
-}
-carrier_id {
-  canonical_id: 2511
-  carrier_name: "Kena"
-  carrier_attribute {
-    mccmnc_tuple: "22207"
-  }
-}
-carrier_id {
-  canonical_id: 2512
-  carrier_name: "Goodspeed"
-  carrier_attribute {
-    mccmnc_tuple: "24042"
-    gid1: "C5"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23203"
-    gid1: "C5"
-  }
-}
-carrier_id {
-  canonical_id: 2514
-  carrier_name: "povo"
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    mccmnc_tuple: "44054"
-    gid1: "26"
-  }
-}
-carrier_id {
-  canonical_id: 2515
-  carrier_name: "J:COM MOBILE"
-  carrier_attribute {
-    mccmnc_tuple: "44051"
-    mccmnc_tuple: "44054"
-    gid1: "22"
-  }
-}
-carrier_id {
-  canonical_id: 2516
-  carrier_name: "HMD Connect Pro"
-  carrier_attribute {
-    mccmnc_tuple: "22201"
-    spn: "hmd connect"
-  }
-}
-carrier_id {
-  canonical_id: 2517
-  carrier_name: "Home"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6530"
-  }
-}
-carrier_id {
-  canonical_id: 2518
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6332"
-  }
-}
-carrier_id {
-  canonical_id: 2519
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "6432"
-  }
-}
-carrier_id {
-  canonical_id: 2520
-  carrier_name: "Republic"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6630"
-  }
-}
-carrier_id {
-  canonical_id: 2521
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "7330"
-  }
-}
-carrier_id {
-  canonical_id: 2522
-  carrier_name: "Republic - MVNO1"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "6436"
-  }
-}
-carrier_id {
-  canonical_id: 2523
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "6430"
-  }
-}
-carrier_id {
-  canonical_id: 2524
-  carrier_name: "Erate"
-  carrier_attribute {
-    mccmnc_tuple: "24215"
-    gid1: "0e"
-  }
-}
-carrier_id {
-  canonical_id: 2525
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3432"
-  }
-}
-carrier_id {
-  canonical_id: 2526
-  carrier_name: "Gen Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3430"
-  }
-}
-carrier_id {
-  canonical_id: 2527
-  carrier_name: "Republic"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3436"
-  }
-}
-carrier_id {
-  canonical_id: 2528
-  carrier_name: "Project Genesis"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6538"
-  }
-}
-carrier_id {
-  canonical_id: 2529
-  carrier_name: "DOCOMO MVNO"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-  }
-}
-carrier_id {
-  canonical_id: 2530
-  carrier_name: "Simpel"
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    gid1: "2F"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "20416"
-    spn: "Simpel"
-  }
-}
-carrier_id {
-  canonical_id: 2531
-  carrier_name: "TANGO"
-  carrier_attribute {
-    mccmnc_tuple: "23453"
-    mccmnc_tuple: "313770"
-  }
-}
-carrier_id {
-  canonical_id: 2532
-  carrier_name: "Xfinity MSO"
-  carrier_attribute {
-    mccmnc_tuple: "314200"
-  }
-}
-carrier_id {
-  canonical_id: 2533
-  carrier_name: "ASTCA"
-  carrier_attribute {
-    mccmnc_tuple: "311780"
-  }
-}
-carrier_id {
-  canonical_id: 2534
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3434"
-  }
-}
-carrier_id {
-  canonical_id: 2535
-  carrier_name: "OptiTel"
-  carrier_attribute {
-    mccmnc_tuple: "50552"
-  }
-}
-carrier_id {
-  canonical_id: 2536
-  carrier_name: "1&1"
-  carrier_attribute {
-    mccmnc_tuple: "26223"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    gid1: "118004"
-    gid1: "118006"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    imsi_prefix_xpattern: "26207414x"
-    gid1: "250109"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "26203"
-    imsi_prefix_xpattern: "26203293x"
-    imsi_prefix_xpattern: "26203330x"
-  }
-}
-carrier_id {
-  canonical_id: 2537
-  carrier_name: "CBRS"
-  carrier_attribute {
-    mccmnc_tuple: "315010"
-  }
-}
-carrier_id {
-  canonical_id: 2538
-  carrier_name: "Home"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3438"
-  }
-}
-carrier_id {
-  canonical_id: 2539
-  carrier_name: "Project Genesis"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3440"
-  }
-}
-carrier_id {
-  canonical_id: 2540
-  carrier_name: "mate."
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "mate."
-  }
-}
-carrier_id {
-  canonical_id: 2541
-  carrier_name: "Exetel"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Exetel"
-  }
-}
-carrier_id {
-  canonical_id: 2542
-  carrier_name: "Konec"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Konec"
-  }
-}
-carrier_id {
-  canonical_id: 2543
-  carrier_name: "More"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "More"
-  }
-}
-carrier_id {
-  canonical_id: 2544
-  carrier_name: "TANGERINE"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "TANGERINE"
-  }
-}
-carrier_id {
-  canonical_id: 2545
-  carrier_name: "Your provider"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Your provider"
-  }
-}
-carrier_id {
-  canonical_id: 2546
-  carrier_name: "Wizzee"
-  carrier_attribute {
-    mccmnc_tuple: "34020"
-    imsi_prefix_xpattern: "3402002"
-  }
-}
-carrier_id {
-  canonical_id: 2547
-  carrier_name: "Telet"
-  carrier_attribute {
-    mccmnc_tuple: "23488"
-    mccmnc_tuple: "23588"
-    spn: "Telet"
-  }
-}
-carrier_id {
-  canonical_id: 2548
-  carrier_name: "Ice Norway"
-  carrier_attribute {
-    mccmnc_tuple: "24214"
-  }
-}
-carrier_id {
-  canonical_id: 2549
-  carrier_name: "Lycamobile"
-  carrier_attribute {
-    mccmnc_tuple: "50519"
-    spn: "Lycamobile"
-  }
-}
-carrier_id {
-  canonical_id: 2550
-  carrier_name: "Vodafone"
-  carrier_attribute {
-    mccmnc_tuple: "54715"
-    spn: "Vodafone PF"
-  }
-}
-carrier_id {
-  canonical_id: 2551
-  carrier_name: "Magenta Telekom"
-  carrier_attribute {
-    mccmnc_tuple: "23203"
-    mccmnc_tuple: "23207"
-  }
-}
-carrier_id {
-  canonical_id: 2552
-  carrier_name: "Mytel"
-  carrier_attribute {
-    mccmnc_tuple: "41409"
-  }
-}
-carrier_id {
-  canonical_id: 2553
-  carrier_name: "4ka SK"
-  carrier_attribute {
-    mccmnc_tuple: "23103"
-  }
-}
-carrier_id {
-  canonical_id: 2554
-  carrier_name: "Cellhire"
-  carrier_attribute {
-    mccmnc_tuple: "20834"
-    spn: "eSIMsmart"
-    spn: "O-Events"
-  }
-}
-carrier_id {
-  canonical_id: 2555
-  carrier_name: "Vimla"
-  carrier_attribute {
-    mccmnc_tuple: "24006"
-  }
-}
-carrier_id {
-  canonical_id: 2556
-  carrier_name: "Xfinity Mobile 2.0"
-  carrier_attribute {
-    mccmnc_tuple: "310590"
-    mccmnc_tuple: "310591"
-    mccmnc_tuple: "310599"
-    mccmnc_tuple: "311480"
-    mccmnc_tuple: "311481"
-    mccmnc_tuple: "311482"
-    mccmnc_tuple: "311483"
-    mccmnc_tuple: "311484"
-    mccmnc_tuple: "311485"
-    mccmnc_tuple: "311486"
-    mccmnc_tuple: "311487"
-    mccmnc_tuple: "311488"
-    mccmnc_tuple: "311489"
-    gid1: "BA01640000000000"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "314240"
-  }
-}
-carrier_id {
-  canonical_id: 2557
-  carrier_name: "fraenk"
-  carrier_attribute {
-    mccmnc_tuple: "26201"
-    mccmnc_tuple: "26206"
-    spn: "fraenk"
-    gid1: "44"
-  }
-}
-carrier_id {
-  canonical_id: 2558
-  carrier_name: "Wintel"
-  carrier_attribute {
-    mccmnc_tuple: "45209"
-  }
-}
-carrier_id {
-  canonical_id: 2559
-  carrier_name: "MONACO TELECOM"
-  carrier_attribute {
-    mccmnc_tuple: "21210"
-  }
-}
-carrier_id {
-  canonical_id: 2560
-  carrier_name: "U+264A"
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "040D"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "040E"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302690"
-    gid1: "F1"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "302760"
-    gid1: "F1"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "4280"
-  }
-}
-carrier_id {
-  canonical_id: 2561
-  carrier_name: "Lebara"
-  carrier_attribute {
-    mccmnc_tuple: "20838"
-    spn: "Lebara"
-  }
-}
-carrier_id {
-  canonical_id: 2562
-  carrier_name: "Lebara"
-  carrier_attribute {
-    mccmnc_tuple: "26214"
-    spn: "Lebara"
-  }
-}
-carrier_id {
-  canonical_id: 2563
-  carrier_name: "Lebara"
-  carrier_attribute {
-    mccmnc_tuple: "20417"
-    spn: "Lebara"
-  }
-}
-carrier_id {
-  canonical_id: 2564
-  carrier_name: "Lebara"
-  carrier_attribute {
-    mccmnc_tuple: "23487"
-    spn: "Lebara"
-  }
-}
-carrier_id {
-  canonical_id: 2565
-  carrier_name: "Best Telecom"
-  carrier_attribute {
-    mccmnc_tuple: "45707"
-    imsi_prefix_xpattern: "457070001"
-    spn: "Best Mobile"
-  }
-}
-carrier_id {
-  canonical_id: 2566
-  carrier_name: "Zeop_RE"
-  carrier_attribute {
-    mccmnc_tuple: "64704"
-  }
-}
-carrier_id {
-  canonical_id: 2567
-  carrier_name: "SSi Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "302480"
-    imsi_prefix_xpattern: "302480017"
-  }
-}
-carrier_id {
-  canonical_id: 2568
-  carrier_name: "Eeyou Mobility"
-  carrier_attribute {
-    mccmnc_tuple: "302480"
-    imsi_prefix_xpattern: "3024800002"
-  }
-}
-carrier_id {
-  canonical_id: 2569
-  carrier_name: "Safaricom Telecommunications Ethiopia"
-  carrier_attribute {
-    mccmnc_tuple: "63602"
-  }
-}
-carrier_id {
-  canonical_id: 2570
-  carrier_name: "Netcom Group"
-  carrier_attribute {
-    mccmnc_tuple: "20801"
-    spn: "Netcom Mobile"
-    spn: "Mobile O"
-    spn: "YouPrice O"
-  }
-}
-carrier_id {
-  canonical_id: 2571
-  carrier_name: "IZI"
-  carrier_attribute {
-    mccmnc_tuple: "43701"
-    imsi_prefix_xpattern: "437018"
-  }
-}
-carrier_id {
-  canonical_id: 2572
-  carrier_name: "Southern"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "SOUTHERN"
-  }
-}
-carrier_id {
-  canonical_id: 2573
-  carrier_name: "Everyday"
-  carrier_attribute {
-    mccmnc_tuple: "50501"
-    spn: "Everyday"
-  }
-}
-carrier_id {
-  canonical_id: 2575
-  carrier_name: "MVNO"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "20"
-    gid1: "21"
-    gid1: "22"
-    gid1: "23"
-    gid1: "24"
-    gid1: "25"
-    gid1: "26"
-    gid1: "27"
-    gid1: "28"
-    gid1: "29"
-    gid1: "30"
-  }
-}
-carrier_id {
-  canonical_id: 2576
-  carrier_name: "iWireless"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "6957"
-  }
-}
-carrier_id {
-  canonical_id: 2577
-  carrier_name: "Qlink"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "514C"
-  }
-}
-carrier_id {
-  canonical_id: 2578
-  carrier_name: "Tello"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    gid1: "6941"
-  }
-}
-carrier_id {
-  canonical_id: 2579
-  carrier_name: "iSea"
-  carrier_attribute {
-    mccmnc_tuple: "20670"
-    mccmnc_tuple: "20671"
-    mccmnc_tuple: "20672"
-    mccmnc_tuple: "20673"
-    mccmnc_tuple: "20674"
-    spn: "iSea"
-    spn: "BELPOL"
-    spn: "BPS-BPV"
-    spn: "PZA"
-    spn: "POA"
-  }
-}
-carrier_id {
-  canonical_id: 2580
-  carrier_name: "Vodafone Oman"
-  carrier_attribute {
-    mccmnc_tuple: "42206"
-  }
-}
-carrier_id {
-  canonical_id: 2581
-  carrier_name: "DITO Telecommunity Corporation"
-  carrier_attribute {
-    mccmnc_tuple: "51566"
-    spn: "DITO"
-  }
-}
-carrier_id {
-  canonical_id: 2582
-  carrier_name: "Viti"
-  carrier_attribute {
-    mccmnc_tuple: "54705"
-  }
-}
-carrier_id {
-  canonical_id: 2583
-  carrier_name: "DENT"
-  carrier_attribute {
-    mccmnc_tuple: "23450"
-    mccmnc_tuple: "26001"
-    mccmnc_tuple: "26003"
-    mccmnc_tuple: "26006"
-    mccmnc_tuple: "27877"
-    mccmnc_tuple: "42501"
-    mccmnc_tuple: "44011"
-    mccmnc_tuple: "45403"
-    mccmnc_tuple: "51503"
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "310260"
-    mccmnc_tuple: "311882"
-    gid1: "3597bfd533"
-  }
-}
-carrier_id {
-  canonical_id: 2594
-  carrier_name: "Coriolis ESP"
-  carrier_attribute {
-    mccmnc_tuple: "20810"
-    gid1: "434F5249"
-  }
-}
-carrier_id {
-  canonical_id: 2595
-  carrier_name: "SIMBA"
-  carrier_attribute {
-    mccmnc_tuple: "52510"
-    spn: "SIMBA"
-  }
-}
-carrier_id {
-  canonical_id: 2596
-  carrier_name: "Paradise Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "350007"
-  }
-}
-carrier_id {
-  canonical_id: 2597
-  carrier_name: "Skylo"
-  carrier_attribute {
-    mccmnc_tuple: "90198"
-  }
-}
-carrier_id {
-  canonical_id: 2598
-  carrier_name: "Telnyx"
-  carrier_attribute {
-    mccmnc_tuple: "20601"
-    mccmnc_tuple: "22201"
-    mccmnc_tuple: "311210"
-    mccmnc_tuple: "311588"
-    mccmnc_tuple: "313260"
-    spn: "Telnyx"
-    gid1: "5AA5"
-    gid2: "5254"
-  }
-}
-carrier_id {
-  canonical_id: 2599
-  carrier_name: "NetGenuity"
-  carrier_attribute {
-    mccmnc_tuple: "312630"
-    spn: "NetGenuity"
-    spn: "Persistent Telecom"
-    spn: "PTI"
-  }
-}
-carrier_id {
-  canonical_id: 2600
-  carrier_name: "Spusu AT"
-  carrier_attribute {
-    mccmnc_tuple: "23217"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "41"
-  }
-}
-carrier_id {
-  canonical_id: 2601
-  carrier_name: "HELP mobile AT"
-  carrier_attribute {
-    mccmnc_tuple: "23217"
-    gid1: "42"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "42"
-  }
-}
-carrier_id {
-  canonical_id: 2602
-  carrier_name: "Tchibo mobil AT"
-  carrier_attribute {
-    mccmnc_tuple: "23217"
-    gid1: "44"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "44"
-  }
-}
-carrier_id {
-  canonical_id: 2603
-  carrier_name: "Spusu IT"
-  carrier_attribute {
-    mccmnc_tuple: "22256"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "40"
-  }
-}
-carrier_id {
-  canonical_id: 2604
-  carrier_name: "Spusu GB"
-  carrier_attribute {
-    mccmnc_tuple: "23440"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "48"
-  }
-}
-carrier_id {
-  canonical_id: 2605
-  carrier_name: "Spusu CH"
-  carrier_attribute {
-    mccmnc_tuple: "22871"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "24007"
-    gid1: "52"
-  }
-}
-carrier_id {
-  canonical_id: 2606
-  carrier_name: "Gen Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3442"
-  }
-}
-carrier_id {
-  canonical_id: 2607
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3444"
-  }
-}
-carrier_id {
-  canonical_id: 2608
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3446"
-  }
-}
-carrier_id {
-  canonical_id: 2609
-  carrier_name: "Republic"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3448"
-  }
-}
-carrier_id {
-  canonical_id: 2610
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3450"
-  }
-}
-carrier_id {
-  canonical_id: 2611
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "3452"
-  }
-}
-carrier_id {
-  canonical_id: 2612
-  carrier_name: "Gen Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "6438"
-  }
-}
-carrier_id {
-  canonical_id: 2613
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6732"
-  }
-}
-carrier_id {
-  canonical_id: 2614
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6336"
-  }
-}
-carrier_id {
-  canonical_id: 2615
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6736"
-  }
-}
-carrier_id {
-  canonical_id: 2616
-  carrier_name: "Project Genesis"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6738"
-  }
-}
-carrier_id {
-  canonical_id: 2617
-  carrier_name: "Republic"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6830"
-  }
-}
-carrier_id {
-  canonical_id: 2618
-  carrier_name: "Ting"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "7530"
-  }
-}
-carrier_id {
-  canonical_id: 2619
-  carrier_name: "Gen Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6636"
-  }
-}
-carrier_id {
-  canonical_id: 2620
-  carrier_name: "Gen Mobile"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6836"
-  }
-}
-carrier_id {
-  canonical_id: 2621
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6638"
-  }
-}
-carrier_id {
-  canonical_id: 2622
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "20809"
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "313340"
-    gid1: "6838"
-  }
-}
-carrier_id {
-  canonical_id: 2623
-  carrier_name: "FLOW"
-  carrier_attribute {
-    mccmnc_tuple: "344921"
-  }
-}
-carrier_id {
-  canonical_id: 2624
-  carrier_name: "FLOW"
-  carrier_attribute {
-    mccmnc_tuple: "356110"
-  }
-}
-carrier_id {
-  canonical_id: 2625
-  carrier_name: "BTC"
-  carrier_attribute {
-    mccmnc_tuple: "364039"
-  }
-}
-carrier_id {
-  canonical_id: 2626
-  carrier_name: "Digi Portugal"
-  carrier_attribute {
-    mccmnc_tuple: "26802"
-  }
-}
-carrier_id {
-  canonical_id: 2627
-  carrier_name: "Boost"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "6434"
-  }
-}
-carrier_id {
-  canonical_id: 2628
-  carrier_name: "AT&T Private"
-  carrier_attribute {
-    mccmnc_tuple: "310090"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "80FF"
-  }
-}
-carrier_id {
-  canonical_id: 2629
-  carrier_name: "Nova Labs, Inc."
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    mccmnc_tuple: "315010"
-    spn: "Helium"
-    gid1: "6907"
-  }
-}
-carrier_id {
-  canonical_id: 2630
-  carrier_name: "Nexphone"
-  carrier_attribute {
-    mccmnc_tuple: "22865"
-    spn: "Nexphone"
-    gid1: "4E657870686F6E65"
-    gid2: "4E657870686F6E6532303234"
-  }
-}
-carrier_id {
-  canonical_id: 10000
-  carrier_name: "Tracfone-ATT"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "311180"
-    gid1: "DDFF"
-    gid1: "DEFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310950"
-    gid1: "DDFF"
-  }
-  parent_canonical_id: 2022
-}
-carrier_id {
-  canonical_id: 10001
-  carrier_name: "Tracfone-TMO"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "DDFF"
-    gid1: "DEFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "DEFF"
-  }
-  parent_canonical_id: 2022
-}
-carrier_id {
-  canonical_id: 10002
-  carrier_name: "o2prepaid_gb"
-  carrier_attribute {
-    mccmnc_tuple: "23410"
-    gid1: "61"
-    gid1: "67"
-    gid1: "85"
-    gid1: "99"
-  }
-  parent_canonical_id: 1492
-}
-carrier_id {
-  canonical_id: 10003
-  carrier_name: "o2prepaid_de"
-  carrier_attribute {
-    mccmnc_tuple: "26207"
-    imsi_prefix_xpattern: "2620749"
-  }
-  parent_canonical_id: 1454
-}
-carrier_id {
-  canonical_id: 10004
-  carrier_name: "sprintprepaid_us"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    gid1: "000004"
-  }
-  parent_canonical_id: 1788
-}
-carrier_id {
-  canonical_id: 10005
-  carrier_name: "pcmobile_prepaid_bell"
-  carrier_attribute {
-    mccmnc_tuple: "30264"
-    mccmnc_tuple: "302610"
-    mccmnc_tuple: "302630"
-    mccmnc_tuple: "302640"
-    gid1: "40"
-  }
-  parent_canonical_id: 2053
-}
-carrier_id {
-  canonical_id: 10006
-  carrier_name: "pcmobile_postpaid_telus"
-  carrier_attribute {
-    mccmnc_tuple: "302220"
-    mccmnc_tuple: "302221"
-    gid1: "5043"
-  }
-  parent_canonical_id: 2053
-}
-carrier_id {
-  canonical_id: 10008
-  carrier_name: "Tracfone-VZW"
-  carrier_attribute {
-    mccmnc_tuple: "310590"
-    mccmnc_tuple: "310591"
-    mccmnc_tuple: "310592"
-    mccmnc_tuple: "310593"
-    mccmnc_tuple: "310594"
-    mccmnc_tuple: "310595"
-    mccmnc_tuple: "310596"
-    mccmnc_tuple: "310597"
-    mccmnc_tuple: "310598"
-    mccmnc_tuple: "310599"
-    mccmnc_tuple: "311480"
-    gid1: "BA01270000000000"
-  }
-  parent_canonical_id: 2022
-}
-carrier_id {
-  canonical_id: 10009
-  carrier_name: "C Spire-US"
-  carrier_attribute {
-    mccmnc_tuple: "311230"
-    mccmnc_tuple: "310023"
-  }
-  parent_canonical_id: 1836
-}
-carrier_id {
-  canonical_id: 10010
-  carrier_name: "C Spire-NL"
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    spn: "C Spire"
-  }
-  parent_canonical_id: 1836
-}
-carrier_id {
-  canonical_id: 10011
-  carrier_name: "Red Pocket-TMO"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4201"
-  }
-  parent_canonical_id: 2026
-}
-carrier_id {
-  canonical_id: 10012
-  carrier_name: "Red Pocket-ATT"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "4201"
-  }
-  parent_canonical_id: 2026
-}
-carrier_id {
-  canonical_id: 10013
-  carrier_name: "FirstNet Pacific"
-  carrier_attribute {
-    mccmnc_tuple: "313110"
-    mccmnc_tuple: "313120"
-  }
-  parent_canonical_id: 2119
-}
-carrier_id {
-  canonical_id: 10014
-  carrier_name: "Google Fi-TMO"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    imsi_prefix_xpattern: "31026097"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "4276"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "4276"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10015
-  carrier_name: "Google Fi-Sprint"
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    spn: "Fi Network"
-    spn: "nova"
-    spn: "Google Fi"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    gid1: "A00184"
-    gid1: "A00184FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "310120"
-    privilege_access_rule: "4C36AF4A5BDAD97C1F3D8B283416D244496C2AC5EAFE8226079EF6F676FD1859"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10016
-  carrier_name: "Google Fi-USCellular"
-  carrier_attribute {
-    mccmnc_tuple: "311580"
-    imsi_prefix_xpattern: "3115801"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10017
-  carrier_name: "Google Fi-3UK"
-  carrier_attribute {
-    mccmnc_tuple: "23420"
-    gid1: "0306"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10018
-  carrier_name: "Google Fi-3HK"
-  carrier_attribute {
-    mccmnc_tuple: "45403"
-    gid1: "0206"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10019
-  carrier_name: "Google Fi-3AT"
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "0306"
-  }
-  parent_canonical_id: 1989
-}
-carrier_id {
-  canonical_id: 10020
-  carrier_name: "CTC Telecom Inc"
-  carrier_attribute {
-    mccmnc_tuple: "20404"
-    mccmnc_tuple: "45403"
-    mccmnc_tuple: "45431"
-    iccid_prefix: "898603"
-    iccid_prefix: "898611"
-  }
-  parent_canonical_id: 1854
-}
-carrier_id {
-  canonical_id: 10021
-  carrier_name: "AT&T 5G"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "53FF"
-  }
-  parent_canonical_id: 1187
-}
-carrier_id {
-  canonical_id: 10022
-  carrier_name: "Consumer Cellular ATT"
-  carrier_attribute {
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "2AC9"
-  }
-  parent_canonical_id: 2023
-}
-carrier_id {
-  canonical_id: 10023
-  carrier_name: "Consumer Cellular TMO"
-  carrier_attribute {
-    mccmnc_tuple: "310260"
-    gid1: "2AC9"
-  }
-  parent_canonical_id: 2023
-}
-carrier_id {
-  canonical_id: 10024
-  carrier_name: "Cellcom Core"
-  carrier_attribute {
-    mccmnc_tuple: "311840"
-    gid1: "c1000000"
-  }
-  parent_canonical_id: 1802
-}
-carrier_id {
-  canonical_id: 10025
-  carrier_name: "Rogers 5G"
-  carrier_attribute {
-    mccmnc_tuple: "302720"
-    gid1: "A4"
-  }
-  parent_canonical_id: 1403
-}
-carrier_id {
-  canonical_id: 10026
-  carrier_name: "DOCOMO ahamo"
-  carrier_attribute {
-    mccmnc_tuple: "44010"
-    gid1: "01FFFF"
-  }
-  parent_canonical_id: 850
-}
-carrier_id {
-  canonical_id: 10027
-  carrier_name: "LINEMO"
-  carrier_attribute {
-    mccmnc_tuple: "44020"
-    gid1: "48FFFF"
-  }
-  parent_canonical_id: 1894
-}
-carrier_id {
-  canonical_id: 10028
-  carrier_name: "AT&T 5G SA"
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-    mccmnc_tuple: "310410"
-    mccmnc_tuple: "310950"
-    mccmnc_tuple: "311180"
-    gid1: "52FF"
-  }
-  parent_canonical_id: 1187
-}
-carrier_id {
-  canonical_id: 10029
-  carrier_name: "Cricket 5G"
-  carrier_attribute {
-    mccmnc_tuple: "310150"
-    gid1: "53FF"
-  }
-  parent_canonical_id: 1779
-}
-carrier_id {
-  canonical_id: 10030
-  carrier_name: "TANGO-US"
-  carrier_attribute {
-    mccmnc_tuple: "313770"
-  }
-  parent_canonical_id: 2531
-}
-carrier_id {
-  canonical_id: 10031
-  carrier_name: "TANGO-UK"
-  carrier_attribute {
-    mccmnc_tuple: "23453"
-  }
-  parent_canonical_id: 2531
-}
-carrier_id {
-  canonical_id: 10032
-  carrier_name: "U+264A-3AT Operational"
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "040D"
-  }
-  parent_canonical_id: 2560
-}
-carrier_id {
-  canonical_id: 10033
-  carrier_name: "U+264A-3AT Provisioning"
-  carrier_attribute {
-    mccmnc_tuple: "23210"
-    gid1: "040E"
-  }
-  parent_canonical_id: 2560
-}
-carrier_id {
-  canonical_id: 10034
-  carrier_name: "U+264A-Telus"
-  carrier_attribute {
-    mccmnc_tuple: "302760"
-    gid1: "F1"
-  }
-  parent_canonical_id: 2560
-}
-carrier_id {
-  canonical_id: 10035
-  carrier_name: "U+264A-TMO"
-  carrier_attribute {
-    mccmnc_tuple: "310240"
-    gid1: "4280"
-  }
-  parent_canonical_id: 2560
-}
-carrier_id {
-  canonical_id: 10036
-  carrier_name: "Spectrum NaaS"
-  carrier_attribute {
-    mccmnc_tuple: "313450"
-    gid2: "A700000000000001"
-  }
-  carrier_attribute {
-    mccmnc_tuple: "311480"
-    gid2: "A700000000000001"
-  }
-  parent_canonical_id: 2126
-}
-carrier_id {
-  canonical_id: 10037
-  carrier_name: "U+264A-Bell"
-  carrier_attribute {
-    mccmnc_tuple: "302690"
-    gid1: "F1"
-  }
-  parent_canonical_id: 2560
-}
-version: 117440547
diff --git a/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch b/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch
deleted file mode 100644
index e84d794c..00000000
--- a/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Wed, 3 Jan 2018 11:55:06 -0500
-Subject: [PATCH] Build time variable for AES-256 encryption
-
-Change-Id: Ib2d53a1d22e935ef0fa5f0f91e3bf5308d9c6459
----
- Android.mk |  4 ++++
- cryptfs.c  | 11 +++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/Android.mk b/Android.mk
-index e645574d..7112dcef 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -115,6 +115,10 @@ LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
- LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
- endif
- 
-+ifeq ($(TARGET_WANTS_STRONG_ENCRYPTION),true)
-+LOCAL_CFLAGS += -DCONFIG_STRONG_ENCRYPTION
-+endif
-+
- include $(BUILD_STATIC_LIBRARY)
- 
- include $(CLEAR_VARS)
-diff --git a/cryptfs.c b/cryptfs.c
-index 0ae9d9fe..61416241 100644
---- a/cryptfs.c
-+++ b/cryptfs.c
-@@ -76,9 +76,17 @@
- 
- #define DM_CRYPT_BUF_SIZE 4096
- 
-+#ifdef CONFIG_STRONG_ENCRYPTION
-+#define HASH_COUNT 6000
-+#define KEY_LEN_BYTES 32
-+#define IV_LEN_BYTES 32
-+#define RSA_KEY_SIZE 4096
-+#else
- #define HASH_COUNT 2000
- #define KEY_LEN_BYTES 16
- #define IV_LEN_BYTES 16
-+#define RSA_KEY_SIZE 2048
-+#endif
- 
- #define KEY_IN_FOOTER  "footer"
- 
-@@ -94,13 +102,12 @@
- 
- #define TABLE_LOAD_RETRIES 10
- 
--#define RSA_KEY_SIZE 2048
- #define RSA_KEY_SIZE_BYTES (RSA_KEY_SIZE / 8)
- #define RSA_EXPONENT 0x10001
- #define KEYMASTER_CRYPTFS_RATE_LIMIT 1  // Maximum one try per second
- 
- #define RETRY_MOUNT_ATTEMPTS 20
--#define RETRY_MOUNT_DELAY_SECONDS 1
-+#define RETRY_MOUNT_DELAY_SECONDS 3
- 
- char *me = "cryptfs";
- 
diff --git a/Patches/LineageOS-15.1/android_system_vold/0001-AES256.patch b/Patches/LineageOS-15.1/android_system_vold/0001-AES256.patch
deleted file mode 100644
index 2bf6064f..00000000
--- a/Patches/LineageOS-15.1/android_system_vold/0001-AES256.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Wed, 28 Feb 2018 08:21:28 -0500
-Subject: [PATCH] Build time variable for AES-256 encryption
-
-Change-Id: Ib2d53a1d22e935ef0fa5f0f91e3bf5308d9c6459
----
- Android.mk  | 4 ++++
- cryptfs.cpp | 9 ++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Android.mk b/Android.mk
-index 2beae282..25fd823e 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -115,6 +115,10 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
-   vold_cflags += -DCONFIG_HW_DISK_ENCRYPTION
- endif
- 
-+ifeq ($(TARGET_WANTS_STRONG_ENCRYPTION),true)
-+LOCAL_CFLAGS += -DCONFIG_STRONG_ENCRYPTION
-+endif
-+
- ifneq ($(TARGET_EXFAT_DRIVER),)
-   vold_cflags += -DCONFIG_EXFAT_DRIVER=\"$(TARGET_EXFAT_DRIVER)\"
-   mini_src_files += fs/Exfat.cpp
-diff --git a/cryptfs.cpp b/cryptfs.cpp
-index e33afddf..5102f126 100644
---- a/cryptfs.cpp
-+++ b/cryptfs.cpp
-@@ -75,9 +75,17 @@ extern "C" {
- 
- #define DM_CRYPT_BUF_SIZE 4096
- 
-+#ifdef CONFIG_STRONG_ENCRYPTION
-+#define HASH_COUNT 6000
-+#define KEY_LEN_BYTES 32
-+#define IV_LEN_BYTES 32
-+#define RSA_KEY_SIZE 4096
-+#else
- #define HASH_COUNT 2000
- #define KEY_LEN_BYTES 16
- #define IV_LEN_BYTES 16
-+#define RSA_KEY_SIZE 2048
-+#endif
- 
- #define KEY_IN_FOOTER  "footer"
- 
-@@ -93,7 +101,6 @@ extern "C" {
- 
- #define TABLE_LOAD_RETRIES 10
- 
--#define RSA_KEY_SIZE 2048
- #define RSA_KEY_SIZE_BYTES (RSA_KEY_SIZE / 8)
- #define RSA_EXPONENT 0x10001
- #define KEYMASTER_CRYPTFS_RATE_LIMIT 1  // Maximum one try per second
diff --git a/Patches/LineageOS-16.0/android_frameworks_base/snet-16.patch b/Patches/LineageOS-16.0/android_frameworks_base/snet-16.patch
deleted file mode 100644
index 7e52f0a4..00000000
--- a/Patches/LineageOS-16.0/android_frameworks_base/snet-16.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 1/8] Alter model name to avoid SafetyNet HW attestation
- enforcement
-
-As of September 2, Google is enforcing SafetyNet's previously
-opportunistic hardware-backed attestation based on device information.
-Append a space to the device model name in order to avoid such
-enforcement.
-
-Also contains:
-	Spoof build fingerprint for Google Play Services
-
-	SafetyNet's CTS profile attestation checks whether Build.FINGERPRINT
-	matches that of the device's stock OS, which has passed CTS testing.
-	Spoof the fingerprint for Google Play Services to help pass SafetyNet.
-
-	We used to set the real system build fingerprint to the stock one, but
-	Android relies on each build having a unique fingerprint in order to
-	clear the correct caches and update persistent state for system changes.
-	On devices that no longer receive updates from the OEM, the build
-	fingerprint never changes and Android doesn't account for updates
-	correctly, which causes issues when updating without wiping data.
-	Only spoofing the fingerprint for Google Play Services fixes this issue.
-
-	Corresponding vendor commit:
-	"Only use stock build fingerprint for Google Play Services"
-
-	NB: This code is under the gmscompat package, but it does not depend on
-	any code from gmscompat.
-
-	Change-Id: I26a2498eb2e2163933303b03f6d516e5fb30fe51
-
-* We don't need to spoof the fingerprint here since we do it globally, but we
-  use the Build field spoofing code it added for model
-
-Change-Id: Ib7779e0aae40cab3730a56785e9231896917ab0a
----
- core/java/android/app/Instrumentation.java    |  4 ++
- .../internal/gmscompat/AttestationHooks.java  | 59 +++++++++++++++++++
- 2 files changed, 63 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index d4385549da02..61e4176392f7 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -53,6 +53,8 @@ import android.view.Window;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1119,6 +1121,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1136,6 +1139,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 000000000000..621156eb84b9
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2021 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            // Unlock
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        // Alter model name to avoid hardware attestation enforcement
-+        setBuildField("MODEL", Build.MODEL + " ");
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            spoofBuildGms();
-+        }
-+    }
-+}
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 2/8] keystore: Block key attestation for SafetyNet
-
-SafetyNet (part of Google Play Services) opportunistically uses
-hardware-backed key attestation via KeyStore as a strong integrity
-check. This causes SafetyNet to fail on custom ROMs because the verified
-boot key and bootloader unlock state can be detected from attestation
-certificates.
-
-As a workaround, we can take advantage of the fact that SafetyNet's
-usage of key attestation is opportunistic (i.e. falls back to basic
-integrity checks if it fails) and prevent it from getting the
-attestation certificate chain from KeyStore. This is done by checking
-the stack for DroidGuard, which is the codename for SafetyNet, and
-pretending that the device doesn't support key attestation.
-
-Key attestation has only been blocked for SafetyNet specifically, as
-Google Play Services and other apps have many valid reasons to use it.
-For example, it appears to be involved in Google's mobile security key
-ferature.
-
-Change-Id: I5146439d47f42dc6231cb45c4dab9f61540056f6
----
- .../internal/gmscompat/AttestationHooks.java     | 16 ++++++++++++++++
- .../security/keystore/AndroidKeyStoreSpi.java    |  4 ++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 621156eb84b9..fe12dfe02a9f 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -22,12 +22,15 @@ import android.os.SystemProperties;
- import android.util.Log;
- 
- import java.lang.reflect.Field;
-+import java.util.Arrays;
- 
- /** @hide */
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
- 
-+    private static volatile boolean sIsGms = false;
-+
-     private AttestationHooks() { }
- 
-     private static void setBuildField(String key, String value) {
-@@ -53,7 +56,20 @@ public final class AttestationHooks {
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            sIsGms = true;
-             spoofBuildGms();
-         }
-     }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        // Check stack for SafetyNet
-+        if (sIsGms && isCallerSafetyNet()) {
-+            throw new UnsupportedOperationException();
-+        }
-+    }
- }
-diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-index 4c007cb70ba2..7dcd79197aa5 100644
---- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-@@ -30,6 +30,8 @@ import android.security.keystore.SecureKeyImportUnavailableException;
- import android.security.keystore.WrappedKeyEntry;
- import android.util.Log;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
- import java.io.InputStream;
-@@ -104,6 +106,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         if (alias == null) {
-             throw new NullPointerException("alias == null");
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anirudh Gupta <anirudhgupta109@aosip.dev>
-Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 3/8] AttestationHooks: Set shipping level to 32 for devices
- >=33
-
-If ro.product.first_api_level is 33, it's forced to use HW attestation.
-Setting it to 32 allows for software attestation and passing CTS.
-
-Change-Id: Ie47fd00b009c93580ec8c950d223c60ed63a0d2f
----
- .../internal/gmscompat/AttestationHooks.java  | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index fe12dfe02a9f..f512adc3985b 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -49,9 +49,28 @@ public final class AttestationHooks {
-         }
-     }
- 
-+    private static void setVersionField(String key, Integer value) {
-+        try {
-+            // Unlock
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build.VERSION." + key, e);
-+        }
-+    }
-+
-     private static void spoofBuildGms() {
-         // Alter model name to avoid hardware attestation enforcement
-         setBuildField("MODEL", Build.MODEL + " ");
-+        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-+            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-+        }
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 4/8] Limit SafetyNet workarounds to unstable GMS process
-
-The unstable process is where SafetyNet attestation actually runs, so
-we only need to spoof the model in that process. Leaving other processes
-fixes various issues caused by model detection and flag provisioning,
-including screen-off Voice Match in Google Assistant, broken At a Glance
-weather and settings on Android 12, and more.
-
-Change-Id: Idcf663907a6c3d0408dbd45b1ac53c9eb4200df8
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index f512adc3985b..c1021dd2eb22 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,6 +28,7 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
- 
-@@ -74,7 +75,8 @@ public final class AttestationHooks {
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
--        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 5/8] gmscompat: Apply the SafetyNet workaround to Play Store
- aswell
-
-Play Store is used for the new Play Integrity API, extend the hack
-to it aswell
-
-Test: Device Integrity and Basic Integrity passes.
-
-Change-Id: Id607cdff0b902f285a6c1b769c0a4ee4202842b1
----
- .../android/internal/gmscompat/AttestationHooks.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index c1021dd2eb22..6a4aab000fe0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,9 +28,11 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
- 
-     private AttestationHooks() { }
- 
-@@ -80,6 +82,11 @@ public final class AttestationHooks {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+            spoofBuildGms();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
-@@ -92,5 +99,10 @@ public final class AttestationHooks {
-         if (sIsGms && isCallerSafetyNet()) {
-             throw new UnsupportedOperationException();
-         }
-+
-+        // Check stack for PlayIntegrity
-+        if (sIsFinsky) {
-+            throw new UnsupportedOperationException();
-+        }
-     }
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 6/8] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
-
-Google seems to have patched the KM block to Play Store in record time,
-but is still not enforced for anything under android N.
-
-Since we moved to angler FP we don't need to spoof model to Play Store
-anymore, however the KM block is still needed.
-
-Test: Run Play Intregrity Attestation
-
-Change-Id: Ic2401a6e40ddfc4318a1d0faa87e42eb118ac3d1
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6a4aab000fe0..6bd12a1c1e03 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -69,7 +69,8 @@ public final class AttestationHooks {
-     }
- 
-     private static void spoofBuildGms() {
--        // Alter model name to avoid hardware attestation enforcement
-+        // Alter model name and fingerprint to avoid hardware attestation enforcement
-+        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
-         setBuildField("MODEL", Build.MODEL + " ");
-         if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-             setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-@@ -85,7 +86,6 @@ public final class AttestationHooks {
- 
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
--            spoofBuildGms();
-         }
-     }
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 7/8] gmscompat: Make CTS/Play Integrity pass again
-
-The logic behind CTS and Play Integrity has been updated today it now
-checks the product and model names against the fingerprint and if
-they do not match the CTS profile will fail.
-
-Also while we are at it use a newer FP from Pixel XL and add logging
-for key attestation blocking for debugging.
-
-Test: Boot, check for CTS and Play Integrity
-
-Change-Id: I089d5ef935bba40338e10c795ea7d181103ffd15
----
- .../internal/gmscompat/AttestationHooks.java  | 22 ++++++++-----------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6bd12a1c1e03..b10cb04cb4f3 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
--        setBuildField("MODEL", Build.MODEL + " ");
--        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
--            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
--        }
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MODEL", "Pixel XL");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-@@ -90,18 +90,14 @@ public final class AttestationHooks {
-     }
- 
-     private static boolean isCallerSafetyNet() {
--        return Arrays.stream(Thread.currentThread().getStackTrace())
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-                 .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-     }
- 
-     public static void onEngineGetCertificateChain() {
--        // Check stack for SafetyNet
--        if (sIsGms && isCallerSafetyNet()) {
--            throw new UnsupportedOperationException();
--        }
--
--        // Check stack for PlayIntegrity
--        if (sIsFinsky) {
-+        // Check stack for SafetyNet or Play Integrity
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-             throw new UnsupportedOperationException();
-         }
-     }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davide Garberi <dade.garberi@gmail.com>
-Date: Wed, 8 Nov 2023 21:36:02 +0100
-Subject: [PATCH 8/8] gmscompat: Use new info
-
-Change-Id: I3cb0c55d28249b73ecc53be83bed030304c782d9
----
- .../android/internal/gmscompat/AttestationHooks.java   | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index b10cb04cb4f3..04a536d8073d 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
--        setBuildField("PRODUCT", "marlin");
--        setBuildField("DEVICE", "marlin");
--        setBuildField("MODEL", "Pixel XL");
--        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+        setBuildField("DEVICE", "bullhead");
-+        setBuildField("FINGERPRINT", "google/bullhead/bullhead:8.0.0/OPR6.170623.013/4283548:user/release-keys");
-+        setBuildField("MODEL", "Nexus 5X");
-+        setBuildField("PRODUCT", "bullhead");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
diff --git a/Patches/LineageOS-16.0/android_system_core/snet-16.patch b/Patches/LineageOS-16.0/android_system_core/snet-16.patch
deleted file mode 100644
index 0268a975..00000000
--- a/Patches/LineageOS-16.0/android_system_core/snet-16.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Wed, 7 Oct 2020 00:24:54 -0700
-Subject: [PATCH] init: Set properties to make SafetyNet pass
-
-Google's SafetyNet integrity checks will check the values of these
-properties when performing basic attestation. Setting fake values helps
-us pass basic SafetyNet with no Magisk Hide or kernel patches necessary.
-
-Note that these properties need to be set very early, before parsing the
-kernel command-line, as they are read-only properties that the bootloader
-sets using androidboot kernel arguments. The bootloader's real values
-cause SafetyNet to fail with an unlocked bootloader and/or custom
-software because the verified boot chain is broken in that case.
-
-Change-Id: I66d23fd91d82906b00d5eb020668f01ae83ec31f
-
-- Also don't set these in recovery
-
-Change-Id: I57f6d48acddb29748778053edf354d7bd8994bd7
----
- init/property_service.cpp | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index f47c93596..6c404de62 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -101,6 +101,15 @@ struct PropertyAuditData {
-     const char* name;
- };
- 
-+static void SetSafetyNetProps() {
-+    InitPropertySet("ro.boot.flash.locked", "1");
-+    InitPropertySet("ro.boot.verifiedbootstate", "green");
-+    InitPropertySet("ro.boot.veritymode", "enforcing");
-+    InitPropertySet("ro.boot.vbmeta.device_state", "locked");
-+    InitPropertySet("ro.boot.warranty_bit", "0");
-+    InitPropertySet("ro.warranty_bit", "0");
-+}
-+
- void property_init() {
-     mkdir("/dev/__properties__", S_IRWXU | S_IXGRP | S_IXOTH);
-     CreateSerializedPropertyInfo();
-@@ -110,6 +119,14 @@ void property_init() {
-     if (!property_info_area.LoadDefaultPath()) {
-         LOG(FATAL) << "Failed to load serialized property info file";
-     }
-+
-+    // Report a valid verified boot chain to make Google SafetyNet integrity
-+    // checks pass. This needs to be done before parsing the kernel cmdline as
-+    // these properties are read-only and will be set to invalid values with
-+    // androidboot cmdline arguments.
-+    if (!IsRecoveryMode()) {
-+      SetSafetyNetProps();
-+    }
- }
- static bool CheckMacPerms(const std::string& name, const char* target_context,
-                           const char* source_context, const ucred& cr) {
diff --git a/Patches/LineageOS-17.1/android_frameworks_base/snet-17.patch b/Patches/LineageOS-17.1/android_frameworks_base/snet-17.patch
deleted file mode 100644
index 8187cacf..00000000
--- a/Patches/LineageOS-17.1/android_frameworks_base/snet-17.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 1/8] Alter model name to avoid SafetyNet HW attestation
- enforcement
-
-As of September 2, Google is enforcing SafetyNet's previously
-opportunistic hardware-backed attestation based on device information.
-Append a space to the device model name in order to avoid such
-enforcement.
-
-Also contains:
-	Spoof build fingerprint for Google Play Services
-
-	SafetyNet's CTS profile attestation checks whether Build.FINGERPRINT
-	matches that of the device's stock OS, which has passed CTS testing.
-	Spoof the fingerprint for Google Play Services to help pass SafetyNet.
-
-	We used to set the real system build fingerprint to the stock one, but
-	Android relies on each build having a unique fingerprint in order to
-	clear the correct caches and update persistent state for system changes.
-	On devices that no longer receive updates from the OEM, the build
-	fingerprint never changes and Android doesn't account for updates
-	correctly, which causes issues when updating without wiping data.
-	Only spoofing the fingerprint for Google Play Services fixes this issue.
-
-	Corresponding vendor commit:
-	"Only use stock build fingerprint for Google Play Services"
-
-	NB: This code is under the gmscompat package, but it does not depend on
-	any code from gmscompat.
-
-	Change-Id: I26a2498eb2e2163933303b03f6d516e5fb30fe51
-
-* We don't need to spoof the fingerprint here since we do it globally, but we
-  use the Build field spoofing code it added for model
-
-Change-Id: Ib7779e0aae40cab3730a56785e9231896917ab0a
----
- core/java/android/app/Instrumentation.java    |  4 ++
- .../internal/gmscompat/AttestationHooks.java  | 59 +++++++++++++++++++
- 2 files changed, 63 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index 9720e9f47f83..e19f3fc4db85 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -57,6 +57,8 @@ import android.view.WindowManagerGlobal;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1154,6 +1156,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1171,6 +1174,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 000000000000..621156eb84b9
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2021 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            // Unlock
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        // Alter model name to avoid hardware attestation enforcement
-+        setBuildField("MODEL", Build.MODEL + " ");
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            spoofBuildGms();
-+        }
-+    }
-+}
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 2/8] keystore: Block key attestation for SafetyNet
-
-SafetyNet (part of Google Play Services) opportunistically uses
-hardware-backed key attestation via KeyStore as a strong integrity
-check. This causes SafetyNet to fail on custom ROMs because the verified
-boot key and bootloader unlock state can be detected from attestation
-certificates.
-
-As a workaround, we can take advantage of the fact that SafetyNet's
-usage of key attestation is opportunistic (i.e. falls back to basic
-integrity checks if it fails) and prevent it from getting the
-attestation certificate chain from KeyStore. This is done by checking
-the stack for DroidGuard, which is the codename for SafetyNet, and
-pretending that the device doesn't support key attestation.
-
-Key attestation has only been blocked for SafetyNet specifically, as
-Google Play Services and other apps have many valid reasons to use it.
-For example, it appears to be involved in Google's mobile security key
-ferature.
-
-Change-Id: I5146439d47f42dc6231cb45c4dab9f61540056f6
----
- .../internal/gmscompat/AttestationHooks.java     | 16 ++++++++++++++++
- .../security/keystore/AndroidKeyStoreSpi.java    |  4 ++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 621156eb84b9..fe12dfe02a9f 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -22,12 +22,15 @@ import android.os.SystemProperties;
- import android.util.Log;
- 
- import java.lang.reflect.Field;
-+import java.util.Arrays;
- 
- /** @hide */
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
- 
-+    private static volatile boolean sIsGms = false;
-+
-     private AttestationHooks() { }
- 
-     private static void setBuildField(String key, String value) {
-@@ -53,7 +56,20 @@ public final class AttestationHooks {
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            sIsGms = true;
-             spoofBuildGms();
-         }
-     }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        // Check stack for SafetyNet
-+        if (sIsGms && isCallerSafetyNet()) {
-+            throw new UnsupportedOperationException();
-+        }
-+    }
- }
-diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-index 51c42520ccc9..b77ddc711492 100644
---- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-@@ -30,6 +30,8 @@ import android.security.keystore.SecureKeyImportUnavailableException;
- import android.security.keystore.WrappedKeyEntry;
- import android.util.Log;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import libcore.util.EmptyArray;
- 
- import java.io.ByteArrayInputStream;
-@@ -113,6 +115,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         if (alias == null) {
-             throw new NullPointerException("alias == null");
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anirudh Gupta <anirudhgupta109@aosip.dev>
-Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 3/8] AttestationHooks: Set shipping level to 32 for devices
- >=33
-
-If ro.product.first_api_level is 33, it's forced to use HW attestation.
-Setting it to 32 allows for software attestation and passing CTS.
-
-Change-Id: Ie47fd00b009c93580ec8c950d223c60ed63a0d2f
----
- .../internal/gmscompat/AttestationHooks.java  | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index fe12dfe02a9f..f512adc3985b 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -49,9 +49,28 @@ public final class AttestationHooks {
-         }
-     }
- 
-+    private static void setVersionField(String key, Integer value) {
-+        try {
-+            // Unlock
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build.VERSION." + key, e);
-+        }
-+    }
-+
-     private static void spoofBuildGms() {
-         // Alter model name to avoid hardware attestation enforcement
-         setBuildField("MODEL", Build.MODEL + " ");
-+        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-+            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-+        }
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 4/8] Limit SafetyNet workarounds to unstable GMS process
-
-The unstable process is where SafetyNet attestation actually runs, so
-we only need to spoof the model in that process. Leaving other processes
-fixes various issues caused by model detection and flag provisioning,
-including screen-off Voice Match in Google Assistant, broken At a Glance
-weather and settings on Android 12, and more.
-
-Change-Id: Idcf663907a6c3d0408dbd45b1ac53c9eb4200df8
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index f512adc3985b..c1021dd2eb22 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,6 +28,7 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
- 
-@@ -74,7 +75,8 @@ public final class AttestationHooks {
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
--        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 5/8] gmscompat: Apply the SafetyNet workaround to Play Store
- aswell
-
-Play Store is used for the new Play Integrity API, extend the hack
-to it aswell
-
-Test: Device Integrity and Basic Integrity passes.
-
-Change-Id: Id607cdff0b902f285a6c1b769c0a4ee4202842b1
----
- .../android/internal/gmscompat/AttestationHooks.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index c1021dd2eb22..6a4aab000fe0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,9 +28,11 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
- 
-     private AttestationHooks() { }
- 
-@@ -80,6 +82,11 @@ public final class AttestationHooks {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+            spoofBuildGms();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
-@@ -92,5 +99,10 @@ public final class AttestationHooks {
-         if (sIsGms && isCallerSafetyNet()) {
-             throw new UnsupportedOperationException();
-         }
-+
-+        // Check stack for PlayIntegrity
-+        if (sIsFinsky) {
-+            throw new UnsupportedOperationException();
-+        }
-     }
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 6/8] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
-
-Google seems to have patched the KM block to Play Store in record time,
-but is still not enforced for anything under android N.
-
-Since we moved to angler FP we don't need to spoof model to Play Store
-anymore, however the KM block is still needed.
-
-Test: Run Play Intregrity Attestation
-
-Change-Id: Ic2401a6e40ddfc4318a1d0faa87e42eb118ac3d1
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6a4aab000fe0..6bd12a1c1e03 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -69,7 +69,8 @@ public final class AttestationHooks {
-     }
- 
-     private static void spoofBuildGms() {
--        // Alter model name to avoid hardware attestation enforcement
-+        // Alter model name and fingerprint to avoid hardware attestation enforcement
-+        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
-         setBuildField("MODEL", Build.MODEL + " ");
-         if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-             setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-@@ -85,7 +86,6 @@ public final class AttestationHooks {
- 
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
--            spoofBuildGms();
-         }
-     }
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 7/8] gmscompat: Make CTS/Play Integrity pass again
-
-The logic behind CTS and Play Integrity has been updated today it now
-checks the product and model names against the fingerprint and if
-they do not match the CTS profile will fail.
-
-Also while we are at it use a newer FP from Pixel XL and add logging
-for key attestation blocking for debugging.
-
-Test: Boot, check for CTS and Play Integrity
-
-Change-Id: I089d5ef935bba40338e10c795ea7d181103ffd15
----
- .../internal/gmscompat/AttestationHooks.java  | 22 ++++++++-----------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6bd12a1c1e03..b10cb04cb4f3 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
--        setBuildField("MODEL", Build.MODEL + " ");
--        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
--            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
--        }
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MODEL", "Pixel XL");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-@@ -90,18 +90,14 @@ public final class AttestationHooks {
-     }
- 
-     private static boolean isCallerSafetyNet() {
--        return Arrays.stream(Thread.currentThread().getStackTrace())
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-                 .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-     }
- 
-     public static void onEngineGetCertificateChain() {
--        // Check stack for SafetyNet
--        if (sIsGms && isCallerSafetyNet()) {
--            throw new UnsupportedOperationException();
--        }
--
--        // Check stack for PlayIntegrity
--        if (sIsFinsky) {
-+        // Check stack for SafetyNet or Play Integrity
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-             throw new UnsupportedOperationException();
-         }
-     }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davide Garberi <dade.garberi@gmail.com>
-Date: Wed, 8 Nov 2023 21:36:02 +0100
-Subject: [PATCH 8/8] gmscompat: Use new info
-
-Change-Id: I3cb0c55d28249b73ecc53be83bed030304c782d9
----
- .../android/internal/gmscompat/AttestationHooks.java   | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index b10cb04cb4f3..04a536d8073d 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
--        setBuildField("PRODUCT", "marlin");
--        setBuildField("DEVICE", "marlin");
--        setBuildField("MODEL", "Pixel XL");
--        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+        setBuildField("DEVICE", "bullhead");
-+        setBuildField("FINGERPRINT", "google/bullhead/bullhead:8.0.0/OPR6.170623.013/4283548:user/release-keys");
-+        setBuildField("MODEL", "Nexus 5X");
-+        setBuildField("PRODUCT", "bullhead");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
diff --git a/Patches/LineageOS-17.1/android_system_core/snet-17.patch b/Patches/LineageOS-17.1/android_system_core/snet-17.patch
deleted file mode 100644
index c21c55a5..00000000
--- a/Patches/LineageOS-17.1/android_system_core/snet-17.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Wed, 7 Oct 2020 00:24:54 -0700
-Subject: [PATCH] init: Set properties to make SafetyNet pass
-
-Google's SafetyNet integrity checks will check the values of these
-properties when performing basic attestation. Setting fake values helps
-us pass basic SafetyNet with no Magisk Hide or kernel patches necessary.
-
-Note that these properties need to be set very early, before parsing the
-kernel command-line, as they are read-only properties that the bootloader
-sets using androidboot kernel arguments. The bootloader's real values
-cause SafetyNet to fail with an unlocked bootloader and/or custom
-software because the verified boot chain is broken in that case.
-
-Change-Id: I66d23fd91d82906b00d5eb020668f01ae83ec31f
-
-- Also don't set these in recovery
-
-Change-Id: I57f6d48acddb29748778053edf354d7bd8994bd7
----
- init/property_service.cpp | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 65e9cda1c..7be56d0db 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -117,6 +117,15 @@ static int PropertyAuditCallback(void* data, security_class_t /*cls*/, char* buf
-     return 0;
- }
- 
-+static void SetSafetyNetProps() {
-+    InitPropertySet("ro.boot.flash.locked", "1");
-+    InitPropertySet("ro.boot.verifiedbootstate", "green");
-+    InitPropertySet("ro.boot.veritymode", "enforcing");
-+    InitPropertySet("ro.boot.vbmeta.device_state", "locked");
-+    InitPropertySet("ro.boot.warranty_bit", "0");
-+    InitPropertySet("ro.warranty_bit", "0");
-+}
-+
- void property_init() {
-     selinux_callback cb;
-     cb.func_audit = PropertyAuditCallback;
-@@ -130,6 +139,14 @@ void property_init() {
-     if (!property_info_area.LoadDefaultPath()) {
-         LOG(FATAL) << "Failed to load serialized property info file";
-     }
-+
-+    // Report a valid verified boot chain to make Google SafetyNet integrity
-+    // checks pass. This needs to be done before parsing the kernel cmdline as
-+    // these properties are read-only and will be set to invalid values with
-+    // androidboot cmdline arguments.
-+    if (!IsRecoveryMode()) {
-+      SetSafetyNetProps();
-+    }
- }
- 
- bool CanReadProperty(const std::string& source_context, const std::string& name) {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/snet-18.patch b/Patches/LineageOS-18.1/android_frameworks_base/snet-18.patch
deleted file mode 100644
index 00c8b097..00000000
--- a/Patches/LineageOS-18.1/android_frameworks_base/snet-18.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 1/8] Alter model name to avoid SafetyNet HW attestation
- enforcement
-
-As of September 2, Google is enforcing SafetyNet's previously
-opportunistic hardware-backed attestation based on device information.
-Append a space to the device model name in order to avoid such
-enforcement.
-
-Also contains:
-	Spoof build fingerprint for Google Play Services
-
-	SafetyNet's CTS profile attestation checks whether Build.FINGERPRINT
-	matches that of the device's stock OS, which has passed CTS testing.
-	Spoof the fingerprint for Google Play Services to help pass SafetyNet.
-
-	We used to set the real system build fingerprint to the stock one, but
-	Android relies on each build having a unique fingerprint in order to
-	clear the correct caches and update persistent state for system changes.
-	On devices that no longer receive updates from the OEM, the build
-	fingerprint never changes and Android doesn't account for updates
-	correctly, which causes issues when updating without wiping data.
-	Only spoofing the fingerprint for Google Play Services fixes this issue.
-
-	Corresponding vendor commit:
-	"Only use stock build fingerprint for Google Play Services"
-
-	NB: This code is under the gmscompat package, but it does not depend on
-	any code from gmscompat.
-
-	Change-Id: I26a2498eb2e2163933303b03f6d516e5fb30fe51
-
-* We don't need to spoof the fingerprint here since we do it globally, but we
-  use the Build field spoofing code it added for model
-
-Change-Id: Ib7779e0aae40cab3730a56785e9231896917ab0a
----
- core/java/android/app/Instrumentation.java    |  4 ++
- .../internal/gmscompat/AttestationHooks.java  | 59 +++++++++++++++++++
- 2 files changed, 63 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index 721525d9af9d..09dcad811d4d 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -57,6 +57,8 @@ import android.view.WindowManagerGlobal;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1157,6 +1159,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1174,6 +1177,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 000000000000..621156eb84b9
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2021 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            // Unlock
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        // Alter model name to avoid hardware attestation enforcement
-+        setBuildField("MODEL", Build.MODEL + " ");
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            spoofBuildGms();
-+        }
-+    }
-+}
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 2/8] keystore: Block key attestation for SafetyNet
-
-SafetyNet (part of Google Play Services) opportunistically uses
-hardware-backed key attestation via KeyStore as a strong integrity
-check. This causes SafetyNet to fail on custom ROMs because the verified
-boot key and bootloader unlock state can be detected from attestation
-certificates.
-
-As a workaround, we can take advantage of the fact that SafetyNet's
-usage of key attestation is opportunistic (i.e. falls back to basic
-integrity checks if it fails) and prevent it from getting the
-attestation certificate chain from KeyStore. This is done by checking
-the stack for DroidGuard, which is the codename for SafetyNet, and
-pretending that the device doesn't support key attestation.
-
-Key attestation has only been blocked for SafetyNet specifically, as
-Google Play Services and other apps have many valid reasons to use it.
-For example, it appears to be involved in Google's mobile security key
-ferature.
-
-Change-Id: I5146439d47f42dc6231cb45c4dab9f61540056f6
----
- .../internal/gmscompat/AttestationHooks.java     | 16 ++++++++++++++++
- .../security/keystore/AndroidKeyStoreSpi.java    |  4 ++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 621156eb84b9..fe12dfe02a9f 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -22,12 +22,15 @@ import android.os.SystemProperties;
- import android.util.Log;
- 
- import java.lang.reflect.Field;
-+import java.util.Arrays;
- 
- /** @hide */
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
- 
-+    private static volatile boolean sIsGms = false;
-+
-     private AttestationHooks() { }
- 
-     private static void setBuildField(String key, String value) {
-@@ -53,7 +56,20 @@ public final class AttestationHooks {
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            sIsGms = true;
-             spoofBuildGms();
-         }
-     }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        // Check stack for SafetyNet
-+        if (sIsGms && isCallerSafetyNet()) {
-+            throw new UnsupportedOperationException();
-+        }
-+    }
- }
-diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-index 51c42520ccc9..b77ddc711492 100644
---- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
-@@ -30,6 +30,8 @@ import android.security.keystore.SecureKeyImportUnavailableException;
- import android.security.keystore.WrappedKeyEntry;
- import android.util.Log;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import libcore.util.EmptyArray;
- 
- import java.io.ByteArrayInputStream;
-@@ -113,6 +115,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         if (alias == null) {
-             throw new NullPointerException("alias == null");
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anirudh Gupta <anirudhgupta109@aosip.dev>
-Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 3/8] AttestationHooks: Set shipping level to 32 for devices
- >=33
-
-If ro.product.first_api_level is 33, it's forced to use HW attestation.
-Setting it to 32 allows for software attestation and passing CTS.
-
-Change-Id: Ie47fd00b009c93580ec8c950d223c60ed63a0d2f
----
- .../internal/gmscompat/AttestationHooks.java  | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index fe12dfe02a9f..f512adc3985b 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -49,9 +49,28 @@ public final class AttestationHooks {
-         }
-     }
- 
-+    private static void setVersionField(String key, Integer value) {
-+        try {
-+            // Unlock
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build.VERSION." + key, e);
-+        }
-+    }
-+
-     private static void spoofBuildGms() {
-         // Alter model name to avoid hardware attestation enforcement
-         setBuildField("MODEL", Build.MODEL + " ");
-+        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-+            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-+        }
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 4/8] Limit SafetyNet workarounds to unstable GMS process
-
-The unstable process is where SafetyNet attestation actually runs, so
-we only need to spoof the model in that process. Leaving other processes
-fixes various issues caused by model detection and flag provisioning,
-including screen-off Voice Match in Google Assistant, broken At a Glance
-weather and settings on Android 12, and more.
-
-Change-Id: Idcf663907a6c3d0408dbd45b1ac53c9eb4200df8
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index f512adc3985b..c1021dd2eb22 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,6 +28,7 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
- 
-@@ -74,7 +75,8 @@ public final class AttestationHooks {
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
--        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 5/8] gmscompat: Apply the SafetyNet workaround to Play Store
- aswell
-
-Play Store is used for the new Play Integrity API, extend the hack
-to it aswell
-
-Test: Device Integrity and Basic Integrity passes.
-
-Change-Id: Id607cdff0b902f285a6c1b769c0a4ee4202842b1
----
- .../android/internal/gmscompat/AttestationHooks.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index c1021dd2eb22..6a4aab000fe0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,9 +28,11 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
- 
-     private AttestationHooks() { }
- 
-@@ -80,6 +82,11 @@ public final class AttestationHooks {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+            spoofBuildGms();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
-@@ -92,5 +99,10 @@ public final class AttestationHooks {
-         if (sIsGms && isCallerSafetyNet()) {
-             throw new UnsupportedOperationException();
-         }
-+
-+        // Check stack for PlayIntegrity
-+        if (sIsFinsky) {
-+            throw new UnsupportedOperationException();
-+        }
-     }
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 6/8] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
-
-Google seems to have patched the KM block to Play Store in record time,
-but is still not enforced for anything under android N.
-
-Since we moved to angler FP we don't need to spoof model to Play Store
-anymore, however the KM block is still needed.
-
-Test: Run Play Intregrity Attestation
-
-Change-Id: Ic2401a6e40ddfc4318a1d0faa87e42eb118ac3d1
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6a4aab000fe0..6bd12a1c1e03 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -69,7 +69,8 @@ public final class AttestationHooks {
-     }
- 
-     private static void spoofBuildGms() {
--        // Alter model name to avoid hardware attestation enforcement
-+        // Alter model name and fingerprint to avoid hardware attestation enforcement
-+        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
-         setBuildField("MODEL", Build.MODEL + " ");
-         if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-             setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-@@ -85,7 +86,6 @@ public final class AttestationHooks {
- 
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
--            spoofBuildGms();
-         }
-     }
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 7/8] gmscompat: Make CTS/Play Integrity pass again
-
-The logic behind CTS and Play Integrity has been updated today it now
-checks the product and model names against the fingerprint and if
-they do not match the CTS profile will fail.
-
-Also while we are at it use a newer FP from Pixel XL and add logging
-for key attestation blocking for debugging.
-
-Test: Boot, check for CTS and Play Integrity
-
-Change-Id: I089d5ef935bba40338e10c795ea7d181103ffd15
----
- .../internal/gmscompat/AttestationHooks.java  | 22 ++++++++-----------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6bd12a1c1e03..b10cb04cb4f3 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
--        setBuildField("MODEL", Build.MODEL + " ");
--        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
--            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
--        }
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MODEL", "Pixel XL");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-@@ -90,18 +90,14 @@ public final class AttestationHooks {
-     }
- 
-     private static boolean isCallerSafetyNet() {
--        return Arrays.stream(Thread.currentThread().getStackTrace())
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-                 .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-     }
- 
-     public static void onEngineGetCertificateChain() {
--        // Check stack for SafetyNet
--        if (sIsGms && isCallerSafetyNet()) {
--            throw new UnsupportedOperationException();
--        }
--
--        // Check stack for PlayIntegrity
--        if (sIsFinsky) {
-+        // Check stack for SafetyNet or Play Integrity
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-             throw new UnsupportedOperationException();
-         }
-     }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davide Garberi <dade.garberi@gmail.com>
-Date: Wed, 8 Nov 2023 21:36:02 +0100
-Subject: [PATCH 8/8] gmscompat: Use new info
-
-Change-Id: I3cb0c55d28249b73ecc53be83bed030304c782d9
----
- .../android/internal/gmscompat/AttestationHooks.java   | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index b10cb04cb4f3..04a536d8073d 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
--        setBuildField("PRODUCT", "marlin");
--        setBuildField("DEVICE", "marlin");
--        setBuildField("MODEL", "Pixel XL");
--        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+        setBuildField("DEVICE", "bullhead");
-+        setBuildField("FINGERPRINT", "google/bullhead/bullhead:8.0.0/OPR6.170623.013/4283548:user/release-keys");
-+        setBuildField("MODEL", "Nexus 5X");
-+        setBuildField("PRODUCT", "bullhead");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
diff --git a/Patches/LineageOS-18.1/android_system_core/snet-18.patch b/Patches/LineageOS-18.1/android_system_core/snet-18.patch
deleted file mode 100644
index a1150712..00000000
--- a/Patches/LineageOS-18.1/android_system_core/snet-18.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Wed, 7 Oct 2020 00:24:54 -0700
-Subject: [PATCH] init: Set properties to make SafetyNet pass
-
-Google's SafetyNet integrity checks will check the values of these
-properties when performing basic attestation. Setting fake values helps
-us pass basic SafetyNet with no Magisk Hide or kernel patches necessary.
-
-Note that these properties need to be set very early, before parsing the
-kernel command-line, as they are read-only properties that the bootloader
-sets using androidboot kernel arguments. The bootloader's real values
-cause SafetyNet to fail with an unlocked bootloader and/or custom
-software because the verified boot chain is broken in that case.
-
-Change-Id: I66d23fd91d82906b00d5eb020668f01ae83ec31f
-
-- Also don't set these in recovery
-
-Change-Id: I57f6d48acddb29748778053edf354d7bd8994bd7
----
- init/property_service.cpp | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 42dd5afcb..a2c7c2db6 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -1064,6 +1064,15 @@ static void ProcessKernelCmdline() {
-     }
- }
- 
-+static void SetSafetyNetProps() {
-+    InitPropertySet("ro.boot.flash.locked", "1");
-+    InitPropertySet("ro.boot.verifiedbootstate", "green");
-+    InitPropertySet("ro.boot.veritymode", "enforcing");
-+    InitPropertySet("ro.boot.vbmeta.device_state", "locked");
-+    InitPropertySet("ro.boot.warranty_bit", "0");
-+    InitPropertySet("ro.warranty_bit", "0");
-+}
-+
- void PropertyInit() {
-     selinux_callback cb;
-     cb.func_audit = PropertyAuditCallback;
-@@ -1078,6 +1087,14 @@ void PropertyInit() {
-         LOG(FATAL) << "Failed to load serialized property info file";
-     }
- 
-+    // Report a valid verified boot chain to make Google SafetyNet integrity
-+    // checks pass. This needs to be done before parsing the kernel cmdline as
-+    // these properties are read-only and will be set to invalid values with
-+    // androidboot cmdline arguments.
-+    if (!IsRecoveryMode()) {
-+      SetSafetyNetProps();
-+    }
-+
-     // If arguments are passed both on the command line and in DT,
-     // properties set in DT always have priority over the command-line ones.
-     ProcessKernelDt();
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/snet-19.patch b/Patches/LineageOS-19.1/android_frameworks_base/snet-19.patch
deleted file mode 100644
index 0e45726c..00000000
--- a/Patches/LineageOS-19.1/android_frameworks_base/snet-19.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 1/8] Alter model name to avoid SafetyNet HW attestation
- enforcement
-
-As of September 2, Google is enforcing SafetyNet's previously
-opportunistic hardware-backed attestation based on device information.
-Append a space to the device model name in order to avoid such
-enforcement.
-
-Also contains:
-	Spoof build fingerprint for Google Play Services
-
-	SafetyNet's CTS profile attestation checks whether Build.FINGERPRINT
-	matches that of the device's stock OS, which has passed CTS testing.
-	Spoof the fingerprint for Google Play Services to help pass SafetyNet.
-
-	We used to set the real system build fingerprint to the stock one, but
-	Android relies on each build having a unique fingerprint in order to
-	clear the correct caches and update persistent state for system changes.
-	On devices that no longer receive updates from the OEM, the build
-	fingerprint never changes and Android doesn't account for updates
-	correctly, which causes issues when updating without wiping data.
-	Only spoofing the fingerprint for Google Play Services fixes this issue.
-
-	Corresponding vendor commit:
-	"Only use stock build fingerprint for Google Play Services"
-
-	NB: This code is under the gmscompat package, but it does not depend on
-	any code from gmscompat.
-
-	Change-Id: I26a2498eb2e2163933303b03f6d516e5fb30fe51
-
-* We don't need to spoof the fingerprint here since we do it globally, but we
-  use the Build field spoofing code it added for model
-
-Change-Id: Ib7779e0aae40cab3730a56785e9231896917ab0a
----
- core/java/android/app/Instrumentation.java    |  4 ++
- .../internal/gmscompat/AttestationHooks.java  | 59 +++++++++++++++++++
- 2 files changed, 63 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index fd6fa57b9e8d..05d840dca223 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -57,6 +57,8 @@ import android.view.WindowManagerGlobal;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1188,6 +1190,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1205,6 +1208,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 000000000000..621156eb84b9
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2021 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            // Unlock
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        // Alter model name to avoid hardware attestation enforcement
-+        setBuildField("MODEL", Build.MODEL + " ");
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            spoofBuildGms();
-+        }
-+    }
-+}
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 2/8] keystore: Block key attestation for SafetyNet
-
-SafetyNet (part of Google Play Services) opportunistically uses
-hardware-backed key attestation via KeyStore as a strong integrity
-check. This causes SafetyNet to fail on custom ROMs because the verified
-boot key and bootloader unlock state can be detected from attestation
-certificates.
-
-As a workaround, we can take advantage of the fact that SafetyNet's
-usage of key attestation is opportunistic (i.e. falls back to basic
-integrity checks if it fails) and prevent it from getting the
-attestation certificate chain from KeyStore. This is done by checking
-the stack for DroidGuard, which is the codename for SafetyNet, and
-pretending that the device doesn't support key attestation.
-
-Key attestation has only been blocked for SafetyNet specifically, as
-Google Play Services and other apps have many valid reasons to use it.
-For example, it appears to be involved in Google's mobile security key
-ferature.
-
-Change-Id: I5146439d47f42dc6231cb45c4dab9f61540056f6
----
- .../internal/gmscompat/AttestationHooks.java     | 16 ++++++++++++++++
- .../security/keystore2/AndroidKeyStoreSpi.java   |  3 +++
- 2 files changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 621156eb84b9..fe12dfe02a9f 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -22,12 +22,15 @@ import android.os.SystemProperties;
- import android.util.Log;
- 
- import java.lang.reflect.Field;
-+import java.util.Arrays;
- 
- /** @hide */
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
- 
-+    private static volatile boolean sIsGms = false;
-+
-     private AttestationHooks() { }
- 
-     private static void setBuildField(String key, String value) {
-@@ -53,7 +56,20 @@ public final class AttestationHooks {
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            sIsGms = true;
-             spoofBuildGms();
-         }
-     }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        // Check stack for SafetyNet
-+        if (sIsGms && isCallerSafetyNet()) {
-+            throw new UnsupportedOperationException();
-+        }
-+    }
- }
-diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-index 33411e1ec5b9..133a4094d434 100644
---- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-@@ -42,6 +42,7 @@ import android.system.keystore2.ResponseCode;
- import android.util.Log;
- 
- import com.android.internal.annotations.VisibleForTesting;
-+import com.android.internal.gmscompat.AttestationHooks;
- 
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
-@@ -164,6 +165,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         KeyEntryResponse response = getKeyMetadata(alias);
- 
-         if (response == null || response.metadata.certificate == null) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anirudh Gupta <anirudhgupta109@aosip.dev>
-Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 3/8] AttestationHooks: Set shipping level to 32 for devices
- >=33
-
-If ro.product.first_api_level is 33, it's forced to use HW attestation.
-Setting it to 32 allows for software attestation and passing CTS.
-
-Change-Id: Ie47fd00b009c93580ec8c950d223c60ed63a0d2f
----
- .../internal/gmscompat/AttestationHooks.java  | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index fe12dfe02a9f..f512adc3985b 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -49,9 +49,28 @@ public final class AttestationHooks {
-         }
-     }
- 
-+    private static void setVersionField(String key, Integer value) {
-+        try {
-+            // Unlock
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build.VERSION." + key, e);
-+        }
-+    }
-+
-     private static void spoofBuildGms() {
-         // Alter model name to avoid hardware attestation enforcement
-         setBuildField("MODEL", Build.MODEL + " ");
-+        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-+            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-+        }
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 4/8] Limit SafetyNet workarounds to unstable GMS process
-
-The unstable process is where SafetyNet attestation actually runs, so
-we only need to spoof the model in that process. Leaving other processes
-fixes various issues caused by model detection and flag provisioning,
-including screen-off Voice Match in Google Assistant, broken At a Glance
-weather and settings on Android 12, and more.
-
-Change-Id: Idcf663907a6c3d0408dbd45b1ac53c9eb4200df8
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index f512adc3985b..c1021dd2eb22 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,6 +28,7 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
- 
-@@ -74,7 +75,8 @@ public final class AttestationHooks {
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
--        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 5/8] gmscompat: Apply the SafetyNet workaround to Play Store
- aswell
-
-Play Store is used for the new Play Integrity API, extend the hack
-to it aswell
-
-Test: Device Integrity and Basic Integrity passes.
-
-Change-Id: Id607cdff0b902f285a6c1b769c0a4ee4202842b1
----
- .../android/internal/gmscompat/AttestationHooks.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index c1021dd2eb22..6a4aab000fe0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,9 +28,11 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
- 
-     private AttestationHooks() { }
- 
-@@ -80,6 +82,11 @@ public final class AttestationHooks {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+            spoofBuildGms();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
-@@ -92,5 +99,10 @@ public final class AttestationHooks {
-         if (sIsGms && isCallerSafetyNet()) {
-             throw new UnsupportedOperationException();
-         }
-+
-+        // Check stack for PlayIntegrity
-+        if (sIsFinsky) {
-+            throw new UnsupportedOperationException();
-+        }
-     }
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 6/8] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
-
-Google seems to have patched the KM block to Play Store in record time,
-but is still not enforced for anything under android N.
-
-Since we moved to angler FP we don't need to spoof model to Play Store
-anymore, however the KM block is still needed.
-
-Test: Run Play Intregrity Attestation
-
-Change-Id: Ic2401a6e40ddfc4318a1d0faa87e42eb118ac3d1
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6a4aab000fe0..6bd12a1c1e03 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -69,7 +69,8 @@ public final class AttestationHooks {
-     }
- 
-     private static void spoofBuildGms() {
--        // Alter model name to avoid hardware attestation enforcement
-+        // Alter model name and fingerprint to avoid hardware attestation enforcement
-+        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
-         setBuildField("MODEL", Build.MODEL + " ");
-         if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-             setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-@@ -85,7 +86,6 @@ public final class AttestationHooks {
- 
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
--            spoofBuildGms();
-         }
-     }
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 7/8] gmscompat: Make CTS/Play Integrity pass again
-
-The logic behind CTS and Play Integrity has been updated today it now
-checks the product and model names against the fingerprint and if
-they do not match the CTS profile will fail.
-
-Also while we are at it use a newer FP from Pixel XL and add logging
-for key attestation blocking for debugging.
-
-Test: Boot, check for CTS and Play Integrity
-
-Change-Id: I089d5ef935bba40338e10c795ea7d181103ffd15
----
- .../internal/gmscompat/AttestationHooks.java  | 22 ++++++++-----------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6bd12a1c1e03..b10cb04cb4f3 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
--        setBuildField("MODEL", Build.MODEL + " ");
--        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
--            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
--        }
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MODEL", "Pixel XL");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-@@ -90,18 +90,14 @@ public final class AttestationHooks {
-     }
- 
-     private static boolean isCallerSafetyNet() {
--        return Arrays.stream(Thread.currentThread().getStackTrace())
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-                 .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-     }
- 
-     public static void onEngineGetCertificateChain() {
--        // Check stack for SafetyNet
--        if (sIsGms && isCallerSafetyNet()) {
--            throw new UnsupportedOperationException();
--        }
--
--        // Check stack for PlayIntegrity
--        if (sIsFinsky) {
-+        // Check stack for SafetyNet or Play Integrity
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-             throw new UnsupportedOperationException();
-         }
-     }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davide Garberi <dade.garberi@gmail.com>
-Date: Wed, 8 Nov 2023 21:36:02 +0100
-Subject: [PATCH 8/8] gmscompat: Use new info
-
-Change-Id: I3cb0c55d28249b73ecc53be83bed030304c782d9
----
- .../android/internal/gmscompat/AttestationHooks.java   | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index b10cb04cb4f3..04a536d8073d 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
--        setBuildField("PRODUCT", "marlin");
--        setBuildField("DEVICE", "marlin");
--        setBuildField("MODEL", "Pixel XL");
--        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+        setBuildField("DEVICE", "bullhead");
-+        setBuildField("FINGERPRINT", "google/bullhead/bullhead:8.0.0/OPR6.170623.013/4283548:user/release-keys");
-+        setBuildField("MODEL", "Nexus 5X");
-+        setBuildField("PRODUCT", "bullhead");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
diff --git a/Patches/LineageOS-19.1/android_system_core/snet-19.patch b/Patches/LineageOS-19.1/android_system_core/snet-19.patch
deleted file mode 100644
index cf32e7c9..00000000
--- a/Patches/LineageOS-19.1/android_system_core/snet-19.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Wed, 7 Oct 2020 00:24:54 -0700
-Subject: [PATCH] init: Set properties to make SafetyNet pass
-
-Google's SafetyNet integrity checks will check the values of these
-properties when performing basic attestation. Setting fake values helps
-us pass basic SafetyNet with no Magisk Hide or kernel patches necessary.
-
-Note that these properties need to be set very early, before parsing the
-kernel command-line, as they are read-only properties that the bootloader
-sets using androidboot kernel arguments. The bootloader's real values
-cause SafetyNet to fail with an unlocked bootloader and/or custom
-software because the verified boot chain is broken in that case.
-
-Change-Id: I66d23fd91d82906b00d5eb020668f01ae83ec31f
-
-fastboot: Revert to Android 11 method of checking lock status
-
-Now that we're setting system-wide properties for SafetyNet, which
-includes ro.boot.verifiedbootstate=green, fastbootd always detects the
-bootloader as being locked. Revert to the Android 11 method of reading
-directly from the kernel cmdline to work arround the issue.
-
-- Also don't set these in recovery
-
-Change-Id: I57f6d48acddb29748778053edf354d7bd8994bd7
----
- fastboot/device/utility.cpp |  7 ++++++-
- init/property_service.cpp   | 17 +++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/fastboot/device/utility.cpp b/fastboot/device/utility.cpp
-index b8b3119ac..f9267e0eb 100644
---- a/fastboot/device/utility.cpp
-+++ b/fastboot/device/utility.cpp
-@@ -204,7 +204,12 @@ std::vector<std::string> ListPartitions(FastbootDevice* device) {
- }
- 
- bool GetDeviceLockStatus() {
--    return android::base::GetProperty("ro.boot.verifiedbootstate", "") == "green";
-+    std::string cmdline;
-+    // Return lock status true if unable to read kernel command line.
-+    if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) {
-+        return true;
-+    }
-+    return cmdline.find("androidboot.verifiedbootstate=orange") == std::string::npos;
- }
- 
- bool UpdateAllPartitionMetadata(FastbootDevice* device, const std::string& super_name,
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index d429fc762..c73a2fa5d 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -1251,6 +1251,15 @@ static void ProcessBootconfig() {
-     });
- }
- 
-+static void SetSafetyNetProps() {
-+    InitPropertySet("ro.boot.flash.locked", "1");
-+    InitPropertySet("ro.boot.verifiedbootstate", "green");
-+    InitPropertySet("ro.boot.veritymode", "enforcing");
-+    InitPropertySet("ro.boot.vbmeta.device_state", "locked");
-+    InitPropertySet("ro.boot.warranty_bit", "0");
-+    InitPropertySet("ro.warranty_bit", "0");
-+}
-+
- void PropertyInit() {
-     selinux_callback cb;
-     cb.func_audit = PropertyAuditCallback;
-@@ -1265,6 +1274,14 @@ void PropertyInit() {
-         LOG(FATAL) << "Failed to load serialized property info file";
-     }
- 
-+    // Report a valid verified boot chain to make Google SafetyNet integrity
-+    // checks pass. This needs to be done before parsing the kernel cmdline as
-+    // these properties are read-only and will be set to invalid values with
-+    // androidboot cmdline arguments.
-+    if (!IsRecoveryMode()) {
-+      SetSafetyNetProps();
-+    }
-+
-     // If arguments are passed both on the command line and in DT,
-     // properties set in DT always have priority over the command-line ones.
-     ProcessKernelDt();
diff --git a/Patches/LineageOS-20.0/android_build/0002-OTA_Keys.patch b/Patches/LineageOS-20.0/android_build/0002-OTA_Keys.patch
deleted file mode 100644
index fb2f360a..00000000
--- a/Patches/LineageOS-20.0/android_build/0002-OTA_Keys.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Tue, 6 Apr 2021 05:04:32 -0400
-Subject: [PATCH] Allow setting OTA public keys from environment variable
-
-Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
----
- core/product_config.mk             |  5 +++++
- target/product/security/Android.mk | 21 +++++++++++++++++----
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/core/product_config.mk b/core/product_config.mk
-index 37146d3a9..7dc8113f5 100644
---- a/core/product_config.mk
-+++ b/core/product_config.mk
-@@ -395,6 +395,11 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort $(PRODUCT_OTA_PUBLIC_KEYS))
- PRODUCT_EXTRA_OTA_KEYS := $(sort $(PRODUCT_EXTRA_OTA_KEYS))
- PRODUCT_EXTRA_RECOVERY_KEYS := $(sort $(PRODUCT_EXTRA_RECOVERY_KEYS))
- 
-+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
-+    PRODUCT_OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+    PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
-+endif
-+
- # Resolve and setup per-module dex-preopt configs.
- DEXPREOPT_DISABLED_MODULES :=
- # If a module has multiple setups, the first takes precedence.
-diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk
-index ad25a9261..c2dca4dc4 100644
---- a/target/product/security/Android.mk
-+++ b/target/product/security/Android.mk
-@@ -70,11 +70,17 @@ include $(BUILD_SYSTEM)/base_rules.mk
- 
- extra_ota_keys := $(addsuffix .x509.pem,$(PRODUCT_EXTRA_OTA_KEYS))
- 
--$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
-+OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
-+
-+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
-+    OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+endif
-+
-+$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(OTA_PUBLIC_KEYS)
- $(LOCAL_BUILT_MODULE): PRIVATE_EXTRA_OTA_KEYS := $(extra_ota_keys)
- $(LOCAL_BUILT_MODULE): \
- 	    $(SOONG_ZIP) \
--	    $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \
-+	    $(OTA_PUBLIC_KEYS) \
- 	    $(extra_ota_keys)
- 	$(SOONG_ZIP) -o $@ -j -symlinks=false \
- 	    $(addprefix -f ,$(PRIVATE_CERT) $(PRIVATE_EXTRA_OTA_KEYS))
-@@ -95,11 +101,18 @@ include $(BUILD_SYSTEM)/base_rules.mk
- 
- extra_recovery_keys := $(addsuffix .x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS))
- 
--$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
-+OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
-+
-+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
-+    OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+    extra_recovery_keys := $(OTA_KEY_OVERRIDE_DIR)/extra.x509.pem
-+endif
-+
-+$(LOCAL_BUILT_MODULE): PRIVATE_CERT := $(OTA_PUBLIC_KEYS)
- $(LOCAL_BUILT_MODULE): PRIVATE_EXTRA_RECOVERY_KEYS := $(extra_recovery_keys)
- $(LOCAL_BUILT_MODULE): \
- 	    $(SOONG_ZIP) \
--	    $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem \
-+	    $(OTA_PUBLIC_KEYS) \
- 	    $(extra_recovery_keys)
- 	$(SOONG_ZIP) -o $@ -j -symlinks=false \
- 	    $(addprefix -f ,$(PRIVATE_CERT) $(PRIVATE_EXTRA_RECOVERY_KEYS))
diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch b/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch
deleted file mode 100644
index 8080dbbd..00000000
--- a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d0c4f3aa7c7640afc0496a9c901eeb49c65b47d Mon Sep 17 00:00:00 2001
-From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
-Date: Tue, 31 Jan 2023 19:32:46 +0200
-Subject: [PATCH] require fs-verity when installing system package updates
-
----
- .../android/server/pm/InstallPackageHelper.java  | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-index e929e4762126..2bfbd199d7f5 100644
---- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
-+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-@@ -1513,6 +1513,22 @@ && cannotInstallWithBadPermissionGroups(parsedPackage)) {
-                     "Failed to set up verity: " + e);
-         }
- 
-+        boolean checkVerity = true;
-+        if (Build.IS_DEBUGGABLE) {
-+            if (SystemProperties.getBoolean("persist.disable_install_time_fsverity_check", false)) {
-+                checkVerity = false;
-+            }
-+        }
-+
-+        if (checkVerity && PackageVerityExt.getSystemPackage(parsedPackage) != null) {
-+            try {
-+                PackageVerityExt.checkFsVerity(parsedPackage);
-+            } catch (PackageManagerException e) {
-+                throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR,
-+                        "fs-verity not set up for system package update " + e);
-+            }
-+        }
-+
-         final PackageFreezer freezer =
-                 freezePackageForInstall(pkgName, installFlags, "installPackageLI");
-         boolean shouldCloseFreezerBeforeReturn = true;
diff --git a/Patches/LineageOS-20.0/android_frameworks_base/snet-20.patch b/Patches/LineageOS-20.0/android_frameworks_base/snet-20.patch
deleted file mode 100644
index 5015310a..00000000
--- a/Patches/LineageOS-20.0/android_frameworks_base/snet-20.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 19:59:51 -0700
-Subject: [PATCH 1/8] Alter model name to avoid SafetyNet HW attestation
- enforcement
-
-As of September 2, Google is enforcing SafetyNet's previously
-opportunistic hardware-backed attestation based on device information.
-Append a space to the device model name in order to avoid such
-enforcement.
-
-Also contains:
-	Spoof build fingerprint for Google Play Services
-
-	SafetyNet's CTS profile attestation checks whether Build.FINGERPRINT
-	matches that of the device's stock OS, which has passed CTS testing.
-	Spoof the fingerprint for Google Play Services to help pass SafetyNet.
-
-	We used to set the real system build fingerprint to the stock one, but
-	Android relies on each build having a unique fingerprint in order to
-	clear the correct caches and update persistent state for system changes.
-	On devices that no longer receive updates from the OEM, the build
-	fingerprint never changes and Android doesn't account for updates
-	correctly, which causes issues when updating without wiping data.
-	Only spoofing the fingerprint for Google Play Services fixes this issue.
-
-	Corresponding vendor commit:
-	"Only use stock build fingerprint for Google Play Services"
-
-	NB: This code is under the gmscompat package, but it does not depend on
-	any code from gmscompat.
-
-	Change-Id: I26a2498eb2e2163933303b03f6d516e5fb30fe51
-
-* We don't need to spoof the fingerprint here since we do it globally, but we
-  use the Build field spoofing code it added for model
-
-Change-Id: Ib7779e0aae40cab3730a56785e9231896917ab0a
----
- core/java/android/app/Instrumentation.java    |  4 ++
- .../internal/gmscompat/AttestationHooks.java  | 59 +++++++++++++++++++
- 2 files changed, 63 insertions(+)
- create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
-
-diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index 556058b567f9..44449588bbab 100644
---- a/core/java/android/app/Instrumentation.java
-+++ b/core/java/android/app/Instrumentation.java
-@@ -57,6 +57,8 @@ import android.view.WindowManagerGlobal;
- 
- import com.android.internal.content.ReferrerIntent;
- 
-+import com.android.internal.gmscompat.AttestationHooks;
-+
- import java.io.File;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -1242,6 +1244,7 @@ public class Instrumentation {
-         Application app = getFactory(context.getPackageName())
-                 .instantiateApplication(cl, className);
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
-     
-@@ -1259,6 +1262,7 @@ public class Instrumentation {
-             ClassNotFoundException {
-         Application app = (Application)clazz.newInstance();
-         app.attach(context);
-+        AttestationHooks.initApplicationBeforeOnCreate(app);
-         return app;
-     }
- 
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-new file mode 100644
-index 000000000000..621156eb84b9
---- /dev/null
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (C) 2021 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package com.android.internal.gmscompat;
-+
-+import android.app.Application;
-+import android.os.Build;
-+import android.os.SystemProperties;
-+import android.util.Log;
-+
-+import java.lang.reflect.Field;
-+
-+/** @hide */
-+public final class AttestationHooks {
-+    private static final String TAG = "GmsCompat/Attestation";
-+    private static final String PACKAGE_GMS = "com.google.android.gms";
-+
-+    private AttestationHooks() { }
-+
-+    private static void setBuildField(String key, String value) {
-+        try {
-+            // Unlock
-+            Field field = Build.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build." + key, e);
-+        }
-+    }
-+
-+    private static void spoofBuildGms() {
-+        // Alter model name to avoid hardware attestation enforcement
-+        setBuildField("MODEL", Build.MODEL + " ");
-+    }
-+
-+    public static void initApplicationBeforeOnCreate(Application app) {
-+        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            spoofBuildGms();
-+        }
-+    }
-+}
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 11 Oct 2021 20:00:44 -0700
-Subject: [PATCH 2/8] keystore: Block key attestation for SafetyNet
-
-SafetyNet (part of Google Play Services) opportunistically uses
-hardware-backed key attestation via KeyStore as a strong integrity
-check. This causes SafetyNet to fail on custom ROMs because the verified
-boot key and bootloader unlock state can be detected from attestation
-certificates.
-
-As a workaround, we can take advantage of the fact that SafetyNet's
-usage of key attestation is opportunistic (i.e. falls back to basic
-integrity checks if it fails) and prevent it from getting the
-attestation certificate chain from KeyStore. This is done by checking
-the stack for DroidGuard, which is the codename for SafetyNet, and
-pretending that the device doesn't support key attestation.
-
-Key attestation has only been blocked for SafetyNet specifically, as
-Google Play Services and other apps have many valid reasons to use it.
-For example, it appears to be involved in Google's mobile security key
-ferature.
-
-Change-Id: I5146439d47f42dc6231cb45c4dab9f61540056f6
----
- .../internal/gmscompat/AttestationHooks.java     | 16 ++++++++++++++++
- .../security/keystore2/AndroidKeyStoreSpi.java   |  3 +++
- 2 files changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 621156eb84b9..fe12dfe02a9f 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -22,12 +22,15 @@ import android.os.SystemProperties;
- import android.util.Log;
- 
- import java.lang.reflect.Field;
-+import java.util.Arrays;
- 
- /** @hide */
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
- 
-+    private static volatile boolean sIsGms = false;
-+
-     private AttestationHooks() { }
- 
-     private static void setBuildField(String key, String value) {
-@@ -53,7 +56,20 @@ public final class AttestationHooks {
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-         if (PACKAGE_GMS.equals(app.getPackageName())) {
-+            sIsGms = true;
-             spoofBuildGms();
-         }
-     }
-+
-+    private static boolean isCallerSafetyNet() {
-+        return Arrays.stream(Thread.currentThread().getStackTrace())
-+                .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-+    }
-+
-+    public static void onEngineGetCertificateChain() {
-+        // Check stack for SafetyNet
-+        if (sIsGms && isCallerSafetyNet()) {
-+            throw new UnsupportedOperationException();
-+        }
-+    }
- }
-diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-index 33411e1ec5b9..133a4094d434 100644
---- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-@@ -42,6 +42,7 @@ import android.system.keystore2.ResponseCode;
- import android.util.Log;
- 
- import com.android.internal.annotations.VisibleForTesting;
-+import com.android.internal.gmscompat.AttestationHooks;
- 
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
-@@ -164,6 +165,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
- 
-     @Override
-     public Certificate[] engineGetCertificateChain(String alias) {
-+        AttestationHooks.onEngineGetCertificateChain();
-+
-         KeyEntryResponse response = getKeyMetadata(alias);
- 
-         if (response == null || response.metadata.certificate == null) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anirudh Gupta <anirudhgupta109@aosip.dev>
-Date: Wed, 4 Jan 2023 18:20:56 +0000
-Subject: [PATCH 3/8] AttestationHooks: Set shipping level to 32 for devices
- >=33
-
-If ro.product.first_api_level is 33, it's forced to use HW attestation.
-Setting it to 32 allows for software attestation and passing CTS.
-
-Change-Id: Ie47fd00b009c93580ec8c950d223c60ed63a0d2f
----
- .../internal/gmscompat/AttestationHooks.java  | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index fe12dfe02a9f..f512adc3985b 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -49,9 +49,28 @@ public final class AttestationHooks {
-         }
-     }
- 
-+    private static void setVersionField(String key, Integer value) {
-+        try {
-+            // Unlock
-+            Field field = Build.VERSION.class.getDeclaredField(key);
-+            field.setAccessible(true);
-+
-+            // Edit
-+            field.set(null, value);
-+
-+            // Lock
-+            field.setAccessible(false);
-+        } catch (NoSuchFieldException | IllegalAccessException e) {
-+            Log.e(TAG, "Failed to spoof Build.VERSION." + key, e);
-+        }
-+    }
-+
-     private static void spoofBuildGms() {
-         // Alter model name to avoid hardware attestation enforcement
-         setBuildField("MODEL", Build.MODEL + " ");
-+        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-+            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-+        }
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Mon, 1 Nov 2021 20:06:48 -0700
-Subject: [PATCH 4/8] Limit SafetyNet workarounds to unstable GMS process
-
-The unstable process is where SafetyNet attestation actually runs, so
-we only need to spoof the model in that process. Leaving other processes
-fixes various issues caused by model detection and flag provisioning,
-including screen-off Voice Match in Google Assistant, broken At a Glance
-weather and settings on Android 12, and more.
-
-Change-Id: Idcf663907a6c3d0408dbd45b1ac53c9eb4200df8
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index f512adc3985b..c1021dd2eb22 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,6 +28,7 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
- 
-@@ -74,7 +75,8 @@ public final class AttestationHooks {
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
--        if (PACKAGE_GMS.equals(app.getPackageName())) {
-+        if (PACKAGE_GMS.equals(app.getPackageName()) &&
-+                PROCESS_UNSTABLE.equals(Application.getProcessName())) {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Tue, 23 Aug 2022 18:57:05 +0200
-Subject: [PATCH 5/8] gmscompat: Apply the SafetyNet workaround to Play Store
- aswell
-
-Play Store is used for the new Play Integrity API, extend the hack
-to it aswell
-
-Test: Device Integrity and Basic Integrity passes.
-
-Change-Id: Id607cdff0b902f285a6c1b769c0a4ee4202842b1
----
- .../android/internal/gmscompat/AttestationHooks.java | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index c1021dd2eb22..6a4aab000fe0 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -28,9 +28,11 @@ import java.util.Arrays;
- public final class AttestationHooks {
-     private static final String TAG = "GmsCompat/Attestation";
-     private static final String PACKAGE_GMS = "com.google.android.gms";
-+    private static final String PACKAGE_FINSKY = "com.android.vending";
-     private static final String PROCESS_UNSTABLE = "com.google.android.gms.unstable";
- 
-     private static volatile boolean sIsGms = false;
-+    private static volatile boolean sIsFinsky = false;
- 
-     private AttestationHooks() { }
- 
-@@ -80,6 +82,11 @@ public final class AttestationHooks {
-             sIsGms = true;
-             spoofBuildGms();
-         }
-+
-+        if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-+            sIsFinsky = true;
-+            spoofBuildGms();
-+        }
-     }
- 
-     private static boolean isCallerSafetyNet() {
-@@ -92,5 +99,10 @@ public final class AttestationHooks {
-         if (sIsGms && isCallerSafetyNet()) {
-             throw new UnsupportedOperationException();
-         }
-+
-+        // Check stack for PlayIntegrity
-+        if (sIsFinsky) {
-+            throw new UnsupportedOperationException();
-+        }
-     }
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Thu, 8 Sep 2022 14:39:52 +0200
-Subject: [PATCH 6/8] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity
-
-Google seems to have patched the KM block to Play Store in record time,
-but is still not enforced for anything under android N.
-
-Since we moved to angler FP we don't need to spoof model to Play Store
-anymore, however the KM block is still needed.
-
-Test: Run Play Intregrity Attestation
-
-Change-Id: Ic2401a6e40ddfc4318a1d0faa87e42eb118ac3d1
----
- .../java/com/android/internal/gmscompat/AttestationHooks.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6a4aab000fe0..6bd12a1c1e03 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -69,7 +69,8 @@ public final class AttestationHooks {
-     }
- 
-     private static void spoofBuildGms() {
--        // Alter model name to avoid hardware attestation enforcement
-+        // Alter model name and fingerprint to avoid hardware attestation enforcement
-+        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
-         setBuildField("MODEL", Build.MODEL + " ");
-         if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-             setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
-@@ -85,7 +86,6 @@ public final class AttestationHooks {
- 
-         if (PACKAGE_FINSKY.equals(app.getPackageName())) {
-             sIsFinsky = true;
--            spoofBuildGms();
-         }
-     }
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dyneteve <dyneteve@hentaios.com>
-Date: Wed, 8 Feb 2023 15:21:01 +0000
-Subject: [PATCH 7/8] gmscompat: Make CTS/Play Integrity pass again
-
-The logic behind CTS and Play Integrity has been updated today it now
-checks the product and model names against the fingerprint and if
-they do not match the CTS profile will fail.
-
-Also while we are at it use a newer FP from Pixel XL and add logging
-for key attestation blocking for debugging.
-
-Test: Boot, check for CTS and Play Integrity
-
-Change-Id: I089d5ef935bba40338e10c795ea7d181103ffd15
----
- .../internal/gmscompat/AttestationHooks.java  | 22 ++++++++-----------
- 1 file changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index 6bd12a1c1e03..b10cb04cb4f3 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/angler/angler:6.0/MDB08L/2343525:user/release-keys");
--        setBuildField("MODEL", Build.MODEL + " ");
--        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
--            setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.S_V2);
--        }
-+        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
-+        setBuildField("PRODUCT", "marlin");
-+        setBuildField("DEVICE", "marlin");
-+        setBuildField("MODEL", "Pixel XL");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
-@@ -90,18 +90,14 @@ public final class AttestationHooks {
-     }
- 
-     private static boolean isCallerSafetyNet() {
--        return Arrays.stream(Thread.currentThread().getStackTrace())
-+        return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
-                 .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
-     }
- 
-     public static void onEngineGetCertificateChain() {
--        // Check stack for SafetyNet
--        if (sIsGms && isCallerSafetyNet()) {
--            throw new UnsupportedOperationException();
--        }
--
--        // Check stack for PlayIntegrity
--        if (sIsFinsky) {
-+        // Check stack for SafetyNet or Play Integrity
-+        if (isCallerSafetyNet() || sIsFinsky) {
-+            Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
-             throw new UnsupportedOperationException();
-         }
-     }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Davide Garberi <dade.garberi@gmail.com>
-Date: Wed, 8 Nov 2023 21:36:02 +0100
-Subject: [PATCH 8/8] gmscompat: Use new info
-
-Change-Id: I3cb0c55d28249b73ecc53be83bed030304c782d9
----
- .../android/internal/gmscompat/AttestationHooks.java   | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index b10cb04cb4f3..04a536d8073d 100644
---- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
-+++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-@@ -70,11 +70,11 @@ public final class AttestationHooks {
- 
-     private static void spoofBuildGms() {
-         // Alter model name and fingerprint to avoid hardware attestation enforcement
--        setBuildField("FINGERPRINT", "google/marlin/marlin:7.1.2/NJH47F/4146041:user/release-keys");
--        setBuildField("PRODUCT", "marlin");
--        setBuildField("DEVICE", "marlin");
--        setBuildField("MODEL", "Pixel XL");
--        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N_MR1);
-+        setBuildField("DEVICE", "bullhead");
-+        setBuildField("FINGERPRINT", "google/bullhead/bullhead:8.0.0/OPR6.170623.013/4283548:user/release-keys");
-+        setBuildField("MODEL", "Nexus 5X");
-+        setBuildField("PRODUCT", "bullhead");
-+        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.N);
-     }
- 
-     public static void initApplicationBeforeOnCreate(Application app) {
diff --git a/Patches/LineageOS-20.0/android_packages_apps_Dialer/0001-Not_Private_Banner.patch b/Patches/LineageOS-20.0/android_packages_apps_Dialer/0001-Not_Private_Banner.patch
deleted file mode 100644
index ff36ee5d..00000000
--- a/Patches/LineageOS-20.0/android_packages_apps_Dialer/0001-Not_Private_Banner.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Torsten Grote <t@grobox.de>
-Date: Thu, 18 Jun 2020 13:15:16 -0300
-Subject: [PATCH] Show privacy warning on in-call screen
-
-Includes:
-Author: Chirayu Desai <chirayudesai1@gmail.com>
-Date:   Tue Jul 28 02:23:37 2020 +0530
-
-    Move the incall warning back to the center
-
-    * Instead of left/started aligned.
-
-Change-Id: Ic9b18c110481df7042ca1daa36182e0999fe948f
----
- .../res/drawable/ic_baseline_warning.xml      |  9 +++++
- .../dialer/theme/common/res/values/colors.xml |  1 +
- .../res/layout/fragment_incoming_call.xml     |  7 +++-
- .../contactgrid/res/layout/incall_header.xml  | 39 +++++++++++++++++++
- .../impl/res/layout/frag_incall_voice.xml     |  7 ++++
- .../android/incallui/res/values/strings.xml   |  3 ++
- .../incallui/theme/res/values/styles.xml      |  4 +-
- 7 files changed, 67 insertions(+), 3 deletions(-)
- create mode 100644 java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
- create mode 100644 java/com/android/incallui/contactgrid/res/layout/incall_header.xml
-
-diff --git a/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
-new file mode 100644
-index 000000000..c2baa9bdb
---- /dev/null
-+++ b/java/com/android/dialer/common/res/drawable/ic_baseline_warning.xml
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-+        android:height="16dp"
-+        android:width="16dp"
-+        android:viewportWidth="24"
-+        android:viewportHeight="24">
-+  <path android:fillColor="?attr/colorControlNormal"
-+        android:pathData="M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"/>
-+</vector>
-\ No newline at end of file
-diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
-index 08255f32f..8995aa868 100644
---- a/java/com/android/dialer/theme/common/res/values/colors.xml
-+++ b/java/com/android/dialer/theme/common/res/values/colors.xml
-@@ -22,6 +22,7 @@
-   <color name="dialer_link_color">#2A56C6</color>
-   <color name="dialer_snackbar_action_text_color">@*android:color/system_accent1_600</color>
-   <color name="dialer_call_icon_color">@android:color/white</color>
-+  <color name="incall_header_background">#f3b514</color>
- 
-   <!-- Colors for the notification actions -->
-   <color name="notification_action_accept">#097138</color>
-diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
-index 0927b4d89..99a742225 100644
---- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
-+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
-@@ -78,18 +78,23 @@
-         android:id="@+id/incall_contact_grid"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
--        android:layout_marginTop="24dp"
-         android:clipChildren="false"
-         android:clipToPadding="false"
-         android:focusable="true"
-         android:gravity="top|center_horizontal"
-         android:orientation="vertical">
- 
-+      <include
-+          layout="@layout/incall_header"
-+          android:layout_width="match_parent"
-+          android:layout_height="wrap_content"/>
-+
-       <include
-           android:id="@id/contactgrid_top_row"
-           layout="@layout/incall_contactgrid_top_row"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-+          android:layout_marginTop="24dp"
-           android:layout_marginBottom="8dp"
-           android:layout_marginStart="24dp"
-           android:layout_marginEnd="24dp"/>
-diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_header.xml b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
-new file mode 100644
-index 000000000..7e8e90e5d
---- /dev/null
-+++ b/java/com/android/incallui/contactgrid/res/layout/incall_header.xml
-@@ -0,0 +1,39 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+  ~ Copyright (C) 2020 The Calyx Institute
-+  ~
-+  ~ Licensed under the Apache License, Version 2.0 (the "License");
-+  ~ you may not use this file except in compliance with the License.
-+  ~ You may obtain a copy of the License at
-+  ~
-+  ~      http://www.apache.org/licenses/LICENSE-2.0
-+  ~
-+  ~ Unless required by applicable law or agreed to in writing, software
-+  ~ distributed under the License is distributed on an "AS IS" BASIS,
-+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+  ~ See the License for the specific language governing permissions and
-+  ~ limitations under the License
-+  -->
-+<LinearLayout
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:layout_width="match_parent"
-+    android:layout_height="wrap_content"
-+    android:background="@color/incall_header_background"
-+    android:gravity="center"
-+    android:orientation="vertical"
-+    android:padding="8dp"
-+    android:fitsSystemWindows="true">
-+
-+  <TextView
-+      android:id="@+id/incall_privacy_title"
-+      android:layout_width="wrap_content"
-+      android:layout_height="wrap_content"
-+      android:textColor="?android:attr/textColorPrimaryInverse"
-+      android:drawableStart="@drawable/ic_baseline_warning"
-+      android:drawablePadding="8dp"
-+      android:drawableTint="?android:attr/textColorPrimaryInverse"
-+      android:gravity="center"
-+      android:padding="4dp"
-+      android:text="@string/incall_screen_privacy_data_collection"/>
-+
-+</LinearLayout>
-diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
-index 45870f307..b61f6be65 100644
---- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
-+++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
-@@ -29,11 +29,18 @@
-       android:clipToPadding="false"
-       android:fitsSystemWindows="true">
- 
-+    <include
-+        layout="@layout/incall_header"
-+        android:id="@+id/incall_header"
-+        android:layout_width="match_parent"
-+        android:layout_height="wrap_content"/>
-+
-     <LinearLayout
-         android:id="@id/incall_contact_grid"
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content"
-         android:layout_marginTop="12dp"
-+        android:layout_below="@+id/incall_header"
-         android:gravity="center_horizontal"
-         android:orientation="vertical">
- 
-diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
-index 687ae142b..c7e81b197 100644
---- a/java/com/android/incallui/res/values/strings.xml
-+++ b/java/com/android/incallui/res/values/strings.xml
-@@ -174,4 +174,7 @@
-   <!-- Text for button to accept RTT request. [CHAR LIMIT=20] -->
-   <string name="rtt_button_accept_request">Join RTT</string>
- 
-+  <!-- Text for call not private banner. -->
-+  <string name="incall_screen_privacy_data_collection">The location and audio of this call are not private.</string>
-+
- </resources>
-diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
-index a0d5caf10..e2f789cd4 100644
---- a/java/com/android/incallui/theme/res/values/styles.xml
-+++ b/java/com/android/incallui/theme/res/values/styles.xml
-@@ -19,7 +19,7 @@
-   <style name="Theme.InCallScreen" parent="@style/Dialer.Dark.ThemeBase.NoActionBar">
-     <item name="android:textColorPrimary">@android:color/white</item>
-     <item name="android:textColorSecondary">#DDFFFFFF</item>
--    <item name="android:statusBarColor">@android:color/transparent</item>
-+    <item name="android:statusBarColor">@color/incall_header_background</item>
-     <item name="android:navigationBarColor">@android:color/transparent</item>
-     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-     <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-@@ -59,7 +59,7 @@
-     <item name="android:windowBackground">@android:color/transparent</item>
-     <item name="android:windowActivityTransitions">false</item>
- 
--    <item name="android:statusBarColor">@android:color/transparent</item>
-+    <item name="android:statusBarColor">@color/incall_header_background</item>
-     <item name="android:navigationBarColor">@android:color/transparent</item>
-     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- 
diff --git a/Patches/LineageOS-20.0/android_system_core/snet-20.patch b/Patches/LineageOS-20.0/android_system_core/snet-20.patch
deleted file mode 100644
index 4682ea4f..00000000
--- a/Patches/LineageOS-20.0/android_system_core/snet-20.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Wed, 7 Oct 2020 00:24:54 -0700
-Subject: [PATCH] init: Set properties to make SafetyNet pass
-
-Google's SafetyNet integrity checks will check the values of these
-properties when performing basic attestation. Setting fake values helps
-us pass basic SafetyNet with no Magisk Hide or kernel patches necessary.
-
-Note that these properties need to be set very early, before parsing the
-kernel command-line, as they are read-only properties that the bootloader
-sets using androidboot kernel arguments. The bootloader's real values
-cause SafetyNet to fail with an unlocked bootloader and/or custom
-software because the verified boot chain is broken in that case.
-
-Change-Id: I66d23fd91d82906b00d5eb020668f01ae83ec31f
-
-fastboot: Revert to Android 11 method of checking lock status
-
-Now that we're setting system-wide properties for SafetyNet, which
-includes ro.boot.verifiedbootstate=green, fastbootd always detects the
-bootloader as being locked. Revert to the Android 11 method of reading
-directly from the kernel cmdline to work arround the issue.
-
-- Also don't set these in recovery
-
-Change-Id: I57f6d48acddb29748778053edf354d7bd8994bd7
----
- fastboot/device/utility.cpp |  7 ++++++-
- init/property_service.cpp   | 17 +++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/fastboot/device/utility.cpp b/fastboot/device/utility.cpp
-index 2d9b71213..a14eea376 100644
---- a/fastboot/device/utility.cpp
-+++ b/fastboot/device/utility.cpp
-@@ -196,7 +196,12 @@ std::vector<std::string> ListPartitions(FastbootDevice* device) {
- }
- 
- bool GetDeviceLockStatus() {
--    return android::base::GetProperty("ro.boot.verifiedbootstate", "") == "green";
-+    std::string cmdline;
-+    // Return lock status true if unable to read kernel command line.
-+    if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) {
-+        return true;
-+    }
-+    return cmdline.find("androidboot.verifiedbootstate=orange") == std::string::npos;
- }
- 
- bool UpdateAllPartitionMetadata(FastbootDevice* device, const std::string& super_name,
-diff --git a/init/property_service.cpp b/init/property_service.cpp
-index 7fd64b389..06709cb7c 100644
---- a/init/property_service.cpp
-+++ b/init/property_service.cpp
-@@ -1286,6 +1286,15 @@ static void ProcessBootconfig() {
-     });
- }
- 
-+static void SetSafetyNetProps() {
-+    InitPropertySet("ro.boot.flash.locked", "1");
-+    InitPropertySet("ro.boot.verifiedbootstate", "green");
-+    InitPropertySet("ro.boot.veritymode", "enforcing");
-+    InitPropertySet("ro.boot.vbmeta.device_state", "locked");
-+    InitPropertySet("ro.boot.warranty_bit", "0");
-+    InitPropertySet("ro.warranty_bit", "0");
-+}
-+
- void PropertyInit() {
-     selinux_callback cb;
-     cb.func_audit = PropertyAuditCallback;
-@@ -1300,6 +1309,14 @@ void PropertyInit() {
-         LOG(FATAL) << "Failed to load serialized property info file";
-     }
- 
-+    // Report a valid verified boot chain to make Google SafetyNet integrity
-+    // checks pass. This needs to be done before parsing the kernel cmdline as
-+    // these properties are read-only and will be set to invalid values with
-+    // androidboot cmdline arguments.
-+    if (!IsRecoveryMode()) {
-+      SetSafetyNetProps();
-+    }
-+
-     // If arguments are passed both on the command line and in DT,
-     // properties set in DT always have priority over the command-line ones.
-     ProcessKernelDt();
diff --git a/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch b/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch
deleted file mode 100644
index 636553c2..00000000
--- a/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
-Date: Tue, 31 Jan 2023 19:32:46 +0200
-Subject: [PATCH] require fs-verity when installing system package updates
-
----
- .../server/pm/InstallPackageHelper.java       | 25 +++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-index 8ebfc9c4bb74..a7def2c273ad 100644
---- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
-+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-@@ -135,6 +135,7 @@ import android.os.Message;
- import android.os.Process;
- import android.os.RemoteException;
- import android.os.SELinux;
-+import android.os.SystemProperties;
- import android.os.Trace;
- import android.os.UserHandle;
- import android.os.UserManager;
-@@ -1603,6 +1604,30 @@ final class InstallPackageHelper {
-             parsedPackage.setBaseApkPath(request.getApexInfo().modulePath);
-         }
- 
-+        final AndroidPackage systemPackage = PackageVerityExt.getSystemPackage(parsedPackage);
-+
-+        if (systemPackage != null) {
-+            // this is an update to a system package
-+
-+            try {
-+                PackageVerityExt.checkFsVerity(parsedPackage);
-+            } catch (PackageManagerException e) {
-+                String message = "fs-verity not set up for system package update " + e;
-+                boolean abortInstall = true;
-+
-+                if (Build.IS_DEBUGGABLE) {
-+                    if (SystemProperties.getBoolean("persist.disable_install_time_fsverity_check", false)) {
-+                        Slog.d(TAG, message);
-+                        abortInstall = false;
-+                    }
-+                }
-+
-+                if (abortInstall) {
-+                    throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR, message);
-+                }
-+            }
-+        }
-+
-         final PackageFreezer freezer =
-                 freezePackageForInstall(pkgName, UserHandle.USER_ALL, installFlags,
-                         "installPackageLI", ApplicationExitInfo.REASON_PACKAGE_UPDATED, request);
diff --git a/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-4.patch b/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-4.patch
deleted file mode 100644
index cd632595..00000000
--- a/Patches/LineageOS-21.0/android_frameworks_base/0029-Strict_Package_Checks-4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 66d463347a80617e13f5c5f26b4be07380421876 Mon Sep 17 00:00:00 2001
-From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
-Date: Tue, 27 Dec 2022 11:40:14 +0200
-Subject: [PATCH] don't allow updating system packages to the same versionCode
-
-versionCode of many system packages, including privileged ones, is set to the current SDK version
-and is thus not incremented during non-major OS upgrades.
-This allowed to downgrade them to the older version that had the same versionCode.
----
- .../android/server/pm/InstallPackageHelper.java | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-index 4d58218b0cc7..71abd7fd1f89 100644
---- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
-+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
-@@ -1624,7 +1624,22 @@ && cannotInstallWithBadPermissionGroups(parsedPackage)) {
-                 }
- 
-                 if (abortInstall) {
--                    throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR, message);
-+                    throw new PrepareFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, message);
-+                }
-+            }
-+
-+            if (parsedPackage.getLongVersionCode() == systemPackage.getLongVersionCode()) {
-+                String message = "Not allowed to update system package to the same versionCode";
-+                boolean abortInstall = true;
-+
-+                if (Build.IS_DEBUGGABLE) {
-+                    if (SystemProperties.getBoolean("persist.disable_same_versionCode_sys_pkg_update_check", false)) {
-+                        Slog.d(TAG, message + ": " + parsedPackage.getManifestPackageName());
-+                        abortInstall = false;
-+                    }
-+                }
-+                if (abortInstall) {
-+                    throw new PrepareFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, message);
-                 }
-             }
-         }
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index e22fd5d0..7a83ab29 100644
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -34,7 +34,6 @@ echo "Deblobbing...";
 	overlay="invalid_placeholder_aekiekan";
 	ipcSec="";
 	kernels=""; #Delimited using " "
-	sepolicy="";
 
 	#ACDB (Audio Calibration DataBase) [Qualcomm] XXX: Breaks audio output
 	#blobs=$blobs".*.acdb|florida.*.bin"; #databases
@@ -43,7 +42,6 @@ echo "Deblobbing...";
 	#ADSP/Hexagon (Hardware Digital Signal Processor) [Qualcomm]
 	#blobs=$blobs"[/]adsp[/]|.*adspd.*|.*adsprpc.*";
 	#blobs=$blobs"|libfastcvadsp_stub.so|libfastcvopt.so|libadsp.*.so|libscve.*.so";
-	#sepolicy=$sepolicy" adspd.te adsprpcd.te";
 
 	#IFAA (???) [Qualcomm/OnePlus?]
 	blobs=$blobs"ifaadaemon|ifaadaemonProxy";
@@ -86,7 +84,6 @@ echo "Deblobbing...";
 		blobs=$blobs"|vendor.qti.atcmdfwd.*|vendor.qti.hardware.radio.atcmdfwd.*";
 		blobs=$blobs"|atfwd.apk";
 		#makes=$makes"|atfwd";
-		sepolicy=$sepolicy" atfwd.te";
 		manifests=$manifests"|AtCmdFwd";
 	fi;
 
@@ -120,7 +117,6 @@ echo "Deblobbing...";
 		#blobs=$blobs"|vendor.qti.data.factory.*|vendor.qti.hardware.data.dynamicdds.*|vendor.qti.hardware.data.latency.*|vendor.qti.hardware.data.qmi.*|vendor.qti.latency.*|vendor.qti.hardware.data.iwlan.*";
 		overlay=$overlay"|config_wlan_data_service_package|config_wlan_network_service_package|config_qualified_networks_service_package";
 		#makes=$makes"|libcnefeatureconfig"; XXX: breaks radio
-		sepolicy=$sepolicy" cnd.te qcneservice.te";
 		manifests=$manifests"|com.quicinc.cne|iwlan";
 		blobs=$blobs"|QualifiedNetworksService.apk"; #Google
 		blobs=$blobs"|qualifiednetworksservice.xml";
@@ -174,7 +170,6 @@ echo "Deblobbing...";
 		blobs=$blobs"|dpmserviceapp.apk";
 		blobs=$blobs"|libdpmctmgr.so|libdpmfdmgr.so|libdpmframework.so|libdpmnsrm.so|libdpmtcm.so|libdpmqmihal.so";
 		blobs=$blobs"|com.qualcomm.qti.dpm.*";
-		sepolicy=$sepolicy" dpmd.te";
 		ipcSec=$ipcSec"|47:4294967295:1001:3004|48:4294967295:1000:3004";
 		manifests=$manifests"|dpmQmiService";
 		makes=$makes"|dpmserviceapp";
@@ -199,8 +194,6 @@ echo "Deblobbing...";
 	manifests=$manifests"|android.hardware.drm";
 	#makes=$makes"|libdrmframework.*"; #necessary to compile
 	#makes=$makes"|mediadrmserver|com.android.mediadrm.signer.*|drmserver"; #Works but causes long boot times
-	#sepolicy=$sepolicy" drmserver.te mediadrmserver.te";
-	sepolicy=$sepolicy" hal_drm_default.te hal_drm.te hal_drm_widevine.te";
 
 	#eMBMS [Qualcomm]
 	blobs=$blobs"|embms.apk";
@@ -212,7 +205,7 @@ echo "Deblobbing...";
 	#External Accessories
 	if [ "$DOS_DEBLOBBER_REMOVE_ACCESSORIES" = true ]; then
 		#tangorpro
-		if [[ "$DOS_VERSION" == "LineageOS-20.0" ]]; then
+		if [[ "$DOS_VERSION" == "LineageOS-20.0" ]] || [[ "$DOS_VERSION" == "LineageOS-21.0" ]]; then
 			blobs=$blobs"|AndroidMediaShell.apk|CastAuthPrebuilt.apk|UsoniaPrebuilt.apk|HomegraphPrebuilt.apk|SmartDisplayPrebuilt.apk|DockManagerPrebuilt.apk|DockSetup.apk";
 			blobs=$blobs"|default-permissions_SmartDisplayPrebuilt.xml|com.google.android.apps.mediashell.xml|com.google.android.apps.nest.castauth.xml|pixel_docking_experience_2022.xml|appcompat[/]compat_framework_overrides.xml|com.google.assistant.hubui.xml|sysconfig[/]communal.xml|com.google.android.apps.nest.dockmanager.app.xml|google-nest-hiddenapi-package-whitelist.xml";
 		fi;
@@ -248,22 +241,19 @@ echo "Deblobbing...";
 	#blobs=$blobs"|flp.conf";
 
 	#Graphics
-	if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-		blobs=$blobs"|eglsubAndroid.so|eglSubDriverAndroid.so|libbccQTI.so|libC2D2.so|libc2d30_bltlib.so|libc2d30.so|libc2d30.*.so|libCB.so|libEGL.*.so|libGLES.*.so|libgsl.so|libq3dtools_esx.so|libq3dtools.*.so|libQTapGLES.so|libscale.so|libsc.*.so";
-		blobs=$blobs"|libglcore.so|libnvblit.so|libnvddk_vic.so|libnvglsi.so|libnvgr.so|libnvptx.so|libnvrmapi.*.so|libnvrm_graphics.so|libnvrm.so|libnvwsi.so"; #NVIDIA
-		blobs=$blobs"|gralloc.*.so|hwcomposer.*.so|memtrack.*.so";
-		blobs=$blobs"|libadreno_utils.so"; #Adreno
-		blobs=$blobs"|libllvm.*.so"; #LLVM
-		blobs=$blobs"|libOpenCL.*.so|libclcore_nvidia.bc"; #OpenCL
-		blobs=$blobs"|vulkan.*.so"; #Vulkan
-		makes=$makes"|android.hardware.vulkan.*|libvulkan";
-	fi;
-	if [ "$DOS_DEBLOBBER_REMOVE_RENDERSCRIPT" = true ] || [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-		blobs=$blobs"|android.hardware.renderscript.*";
-		blobs=$blobs"|librs.*.so|libRSDriver.*.so|libnvRSCompiler.so|libnvRSDriver.so"; #Adreno
-		blobs=$blobs"|libPVRRS.*.so|libufwriter.so"; #Intel
-		makes=$makes"|android.hardware.renderscript.*";
-	fi;
+	#blobs=$blobs"|eglsubAndroid.so|eglSubDriverAndroid.so|libbccQTI.so|libC2D2.so|libc2d30_bltlib.so|libc2d30.so|libc2d30.*.so|libCB.so|libEGL.*.so|libGLES.*.so|libgsl.so|libq3dtools_esx.so|libq3dtools.*.so|libQTapGLES.so|libscale.so|libsc.*.so";
+	#blobs=$blobs"|libglcore.so|libnvblit.so|libnvddk_vic.so|libnvglsi.so|libnvgr.so|libnvptx.so|libnvrmapi.*.so|libnvrm_graphics.so|libnvrm.so|libnvwsi.so"; #NVIDIA
+	#blobs=$blobs"|gralloc.*.so|hwcomposer.*.so|memtrack.*.so";
+	#blobs=$blobs"|libadreno_utils.so"; #Adreno
+	#blobs=$blobs"|libllvm.*.so"; #LLVM
+	#blobs=$blobs"|libOpenCL.*.so|libclcore_nvidia.bc"; #OpenCL
+	#blobs=$blobs"|vulkan.*.so"; #Vulkan
+	#makes=$makes"|android.hardware.vulkan.*|libvulkan";
+	#Renderscript
+	#blobs=$blobs"|android.hardware.renderscript.*";
+	#blobs=$blobs"|librs.*.so|libRSDriver.*.so|libnvRSCompiler.so|libnvRSDriver.so"; #Adreno
+	#blobs=$blobs"|libPVRRS.*.so|libufwriter.so"; #Intel
+	#makes=$makes"|android.hardware.renderscript.*";
 
 	#Felicia [Google?]
 	blobs=$blobs"|MobileFeliCaClient.apk|MobileFeliCaMenuMainApp.apk|MobileFeliCaSettingApp.apk|MobileFeliCaWebPlugin.apk|MobileFeliCaWebPluginBoot.apk";
@@ -386,7 +376,6 @@ echo "Deblobbing...";
 		blobs=$blobs"|lib-dplmedia.so|librcc.so|libvcel.so|libvoice-svc.so";
 		blobs=$blobs"|volte_modem[/]";
 		makes=$makes"|ims-ext-common";
-		sepolicy=$sepolicy" ims.te imscm.te imswmsproxy.te";
 		ipcSec=$ipcSec"|32:4294967295:1001";
 		manifests=$manifests"|qti.ims|radio.ims";
 	fi;
@@ -593,13 +582,10 @@ echo "Deblobbing...";
 	#Time Service [Qualcomm]
 	#https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/time-services/ [headers]
 	#Requires that android_hardware_sony_timekeep be included in repo manifest
-	if [ "$DOS_DEBLOBBER_REPLACE_TIME" = true ]; then
-		#blobs=$blobs"|libtime_genoff.so"; #XXX: Breaks radio
-		blobs=$blobs"|libTimeService.so";
-		blobs=$blobs"|TimeService.apk";
-		blobs=$blobs"|time_daemon";
-		sepolicy=$sepolicy" qtimeservice.te";
-	fi;
+	#blobs=$blobs"|libtime_genoff.so"; #XXX: Breaks radio
+	#blobs=$blobs"|libTimeService.so";
+	#blobs=$blobs"|TimeService.apk";
+	#blobs=$blobs"|time_daemon";
 
 	#[T-Mobile]
 	blobs=$blobs"|TmobileGrsuPrebuilt.apk";
@@ -673,7 +659,6 @@ echo "Deblobbing...";
 	export overlay;
 	export ipcSec;
 	export kernels;
-	export sepolicy;
 	export manifests;
 #
 #END OF BLOBS ARRAY
@@ -685,8 +670,6 @@ echo "Deblobbing...";
 deblobDevice() {
 	local devicePath="$1";
 	cd "$DOS_BUILD_BASE/$devicePath";
-	if [ "$DOS_DEBLOBBER_REPLACE_TIME" = false ]; then local replaceTime="false"; fi; #Disable Time replacement
-	if ! grep -qi "qcom" BoardConfig*.mk; then local replaceTime="false"; fi; #Disable Time Replacement
 	if [ -f Android.mk ]; then
 		#Some devices store these in a dedicated firmware partition, others in /system/vendor/firmware, either way the following are just symlinks
 		#sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware
@@ -699,17 +682,6 @@ deblobDevice() {
 		sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(WIDEVINE_SYMLINKS)//' Android.mk; #Remove Google Widevine firmware
 		sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(WV_SYMLINKS)//' Android.mk; #Remove Google Widevine firmware
 	fi;
-	if [ -f BoardConfig.mk ]; then
-		if [ -z "$replaceTime" ]; then
-			sed -i 's/BOARD_USES_QC_TIME_SERVICES := true/BOARD_USES_QC_TIME_SERVICES := false/' BoardConfig*.mk &>/dev/null || true; #Switch to Sony TimeKeep
-			if ! grep -q "BOARD_USES_QC_TIME_SERVICES := false" BoardConfig.mk; then echo "BOARD_USES_QC_TIME_SERVICES := false" >> BoardConfig.mk; fi; #Switch to Sony TimeKeep
-		fi;
-		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			#sed -i 's/USE_OPENGL_RENDERER := true/USE_OPENGL_RENDERER := false/' BoardConfig.mk;
-			#if ! grep -q "USE_OPENGL_RENDERER := false" BoardConfig.mk; then echo "USE_OPENGL_RENDERER := false" >> BoardConfig.mk; fi;
-			if ! grep -q "USE_OPENGL_RENDERER := true" BoardConfig.mk; then echo "USE_OPENGL_RENDERER := true" >> BoardConfig.mk; fi;
-		fi;
-	fi;
 	if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i 's/BOARD_USES_QCNE := true/BOARD_USES_QCNE := false/' BoardConfig*.mk &>/dev/null || true; fi; #Disable CNE
 	sed -i 's/BOARD_USES_WIPOWER := true/BOARD_USES_WIPOWER := false/' BoardConfig*.mk &>/dev/null || true; #Disable WiPower
 	sed -i 's/TARGET_HAS_HDR_DISPLAY := true/TARGET_HAS_HDR_DISPLAY := false/' BoardConfig*.mk &>/dev/null || true; #Disable HDR
@@ -719,27 +691,7 @@ deblobDevice() {
 	if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then sed -i 's/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false/' BoardConfig*.mk &>/dev/null || true; fi; #Disable Dolby
 	sed -i 's/BOARD_ANT_WIRELESS_DEVICE := true/BOARD_ANT_WIRELESS_DEVICE := false/' BoardConfig*.mk &>/dev/null || true; #Disable ANT
 	awk -i inplace '!/BOARD_ANT_WIRELESS_DEVICE/' BoardConfig*.mk &>/dev/null || true;
-	if [ "$DOS_DEBLOBBER_REMOVE_RENDERSCRIPT" = true ] || [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-		awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk &>/dev/null || true;
-	fi;
-	if [ -f device.mk ]; then
-		if [ -z "$replaceTime" ]; then
-			echo "PRODUCT_PACKAGES += timekeep TimeKeep" >> device.mk; #Switch to Sony TimeKeep
-		fi;
-		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			echo "PRODUCT_PACKAGES += libyuv libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> device.mk; #Build SwiftShader
-		fi;
-	fi;
-	local baseDirTmp=${PWD##*/};
-	local suffixTmp="-common";
-	if [ -f "${PWD##*/}".mk ] && [ "${PWD##*/}".mk != "sepolicy" ]; then
-		if [ -z "$replaceTime" ]; then
-			echo "PRODUCT_PACKAGES += timekeep TimeKeep" >> "${PWD##*/}".mk; #Switch to Sony TimeKeep
-		fi;
-		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			echo "PRODUCT_PACKAGES += libyuv libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> "${PWD##*/}".mk; #Build SwiftShader
-		fi;
-	fi;
+	#awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk &>/dev/null || true; #Renderscript
 
 	sed -i '/loc.nlp_name/d' *.prop *.mk &>/dev/null || true; #Disable QC Location Provider
 	sed -i 's/drm.service.enabled=true/drm.service.enabled=false/' *.prop *.mk &>/dev/null || true;
@@ -757,12 +709,6 @@ deblobDevice() {
 	sed -i '/vendor.camera.extensions/d' *.prop *.mk &>/dev/null || true; #Disable camera extensions
 	if [ -f system.prop ]; then
 		if ! grep -q "drm.service.enabled=false" system.prop; then echo "drm.service.enabled=false" >> system.prop; fi; #Disable DRM server
-		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			echo "sys.ui.hw=disable" >> system.prop;
-			#echo "graphics.gles20.disable_on_bootanim=1" >> system.prop;
-			echo "debug.sf.nobootanimation=1" >> system.prop;
-			sed -i 's/opengles.version=.*/opengles.version=131072/' system.prop;
-		fi;
 	fi
 	if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 		sed -i 's/ims.volte=true/ims.volte=false/' *.prop *.mk &>/dev/null || true;
@@ -819,27 +765,6 @@ deblobDevice() {
 	sed -i 's|<bool name="config_uiBlurEnabled">true</bool>|<bool name="config_uiBlurEnabled">false</bool>|' overlay*/frameworks/base/core/res/res/values/config.xml &>/dev/null || true; #Disable UIBlur
 	awk -i inplace '!/platform_carrier_config_package/' overlay*/packages/services/Telephony/res/values/config.xml &>/dev/null || true;
 	awk -i inplace '!/config_show_adaptive_connectivity/' overlay*/packages/apps/Settings/res/values/config.xml &>/dev/null || true;
-	if [ -d sepolicy ]; then
-		if [ -z "$replaceTime" ]; then
-			numfiles=(*); numfiles=${#numfiles[@]};
-			if [ "$numfiles" -gt "5" ]; then #only if device doesn't use a common sepolicy dir
-				#Switch to Sony TimeKeep
-				#Credit: @aviraxp
-				#Reference: https://github.com/LineageOS/android_device_oneplus_oneplus2/commit/3b152a3c1198d795de4175e6b9927493caf01bf0
-				echo "/sys/devices/soc\.0/qpnp-rtc-8/rtc/rtc0(/.*)? u:object_r:sysfs_rtc:s0" >> sepolicy/file_contexts;
-				echo "/(system/vendor|vendor)/bin/timekeep u:object_r:timekeep_exec:s0" >> sepolicy/file_contexts;
-				echo "type vendor_timekeep_prop, property_type;" >> sepolicy/property.te;
-				echo "persist.vendor.timeadjust u:object_r:vendor_timekeep_prop:s0" >> sepolicy/property_contexts;
-				echo "user=system seinfo=platform name=com.sony.timekeep domain=timekeep_app type=app_data_file" >> sepolicy/seapp_contexts;
-				cp "$DOS_PATCHES_COMMON/android_timekeep_sepolicy/timekeep.te" sepolicy/;
-				cp "$DOS_PATCHES_COMMON/android_timekeep_sepolicy/timekeep_app.te" sepolicy/;
-			fi;
-		fi;
-	fi;
-	if [ -z "$replaceTime" ]; then #Switch to Sony TimeKeep
-		#sed -i 's|service time_daemon /system/bin/time_daemon|service time_daemon /system/bin/timekeep restore\n    oneshot|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true;
-		awk -i inplace '!|mkdir /data/time/ 0700 system system|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true;
-	fi;
 	if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then rm -f board/qcom-cne.mk product/qcom-cne.mk; fi; #Remove CNE
 	if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 		rm -f rootdir/etc/init.qti.ims.sh rootdir/init.qti.ims.sh init.qti.ims.sh; #Remove IMS startup script
@@ -867,17 +792,6 @@ deblobKernel() {
 }
 export -f deblobKernel;
 
-deblobSepolicy() {
-	local sepolicyPath="$1";
-	cd "$DOS_BUILD_BASE/$sepolicyPath";
-	if [ -d sepolicy ]; then
-		cd sepolicy;
-		rm -f $sepolicy;
-	fi;
-	cd "$DOS_BUILD_BASE";
-}
-export -f deblobSepolicy;
-
 deblobVendors() {
 	cd "$DOS_BUILD_BASE";
 	find vendor -regextype posix-extended -regex '.*('$blobs')' -type f -delete; #Delete all blobs
@@ -922,7 +836,6 @@ cd "$DOS_BUILD_BASE";
 find build -name "*.mk" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'awk -i inplace "!/$makes/" "{}"'; #Deblob all makefiles
 find device -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobDevice "$0"' {} \;; #Deblob all device directories
 find device -name "*.mk" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'awk -i inplace "!/$makes/" "{}"'; #Deblob all makefiles
-#find device -maxdepth 3 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobSepolicy "{}"'; #Deblob all device sepolicy directories XXX: Breaks builds when other sepolicy files reference deleted ones
 #find kernel -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobKernel "{}"'; #Deblob all kernel directories
 find vendor -name "*endor*.mk" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobVendorMk "{}"'; #Deblob all makefiles
 find vendor -name "Android.bp" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobVendorBp "{}"'; #Deblob all makefiles
diff --git a/Scripts/Common/Enable_Verity.sh b/Scripts/Common/Enable_Verity.sh
index f2febe46..0e884f4e 100644
--- a/Scripts/Common/Enable_Verity.sh
+++ b/Scripts/Common/Enable_Verity.sh
@@ -39,10 +39,6 @@ enableAVB() {
 		if [[ "$1" == *"xiaomi"* ]]; then #XXX: broken
 			sed -i 's/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2/' *.mk &>/dev/null || true;
 			echo "Setting PERMISSIVE AVB for $1";
-		elif [[ "$DOS_VERSION" == "LineageOS-18.1" ]] && [[ "$1" == *"oneplus/sdm845-common"* ]]; then #XXX: uses stock /vendor
-			sed -i 's/AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2/' *.mk &>/dev/null || true;
-			sed -i 's/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3/AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2/' *.mk &>/dev/null || true;
-			echo "Setting PERMISSIVE AVB for $1";
 		else
 			awk -i inplace '!/AVB_MAKE_VBMETA_IMAGE_ARGS \+= --flag/' *.mk &>/dev/null || true;
 			echo "Setting ENFORCING AVB for $1";
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index 52e3c49d..6b15cea5 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -208,7 +208,7 @@ processRelease() {
 	local OUT_DIR="$DOS_BUILD_BASE/out/target/product/$DEVICE/";
 
 	local RELEASETOOLS_PREFIX="build/tools/releasetools/";
-	if [[ "$DOS_VERSION" == "LineageOS-18.1" ]] || [[ "$DOS_VERSION" == "LineageOS-19.1" ]] || [[ "$DOS_VERSION" == "LineageOS-20.0" ]]; then
+	if [[ "$DOS_VERSION" == "LineageOS-18.1" ]] || [[ "$DOS_VERSION" == "LineageOS-19.1" ]] || [[ "$DOS_VERSION" == "LineageOS-20.0" ]] || [[ "$DOS_VERSION" == "LineageOS-21.0" ]]; then
 		local RELEASETOOLS_PREFIX="";
 	fi;
 
@@ -240,10 +240,10 @@ processRelease() {
 		--extra_apks ServiceUwbResources.apk="$KEY_DIR/releasekey" \
 		--extra_apks ServiceWifiResources.apk="$KEY_DIR/releasekey" \
 		--extra_apks WifiDialog.apk="$KEY_DIR/releasekey");
-	if [[ "$DOS_VERSION" == "LineageOS-20.0" ]]; then
+	if [[ "$DOS_VERSION" == "LineageOS-20.0" ]] || [[ "$DOS_VERSION" == "LineageOS-21.0" ]]; then
 		local APK_SWITCHES_EXTRA=(--extra_apks Bluetooth.apk="$KEY_DIR/bluetooth");
 	fi;
-	if [[ "$DOS_VERSION" == "LineageOS-17.1" ]] || [[ "$DOS_VERSION" == "LineageOS-18.1" ]] || [[ "$DOS_VERSION" == "LineageOS-19.1" ]] || [[ "$DOS_VERSION" == "LineageOS-20.0" ]]; then
+	if [[ "$DOS_VERSION" == "LineageOS-17.1" ]] || [[ "$DOS_VERSION" == "LineageOS-18.1" ]] || [[ "$DOS_VERSION" == "LineageOS-19.1" ]] || [[ "$DOS_VERSION" == "LineageOS-20.0" ]] || [[ "$DOS_VERSION" == "LineageOS-21.0" ]]; then
 		local APEX_SWITCHES=(--extra_apks com.android.adbd.apex="$KEY_DIR/releasekey" \
 			--extra_apex_payload_key com.android.adbd.apex="$KEY_DIR/avb.pem" \
 			--extra_apks com.android.adservices.apex="$KEY_DIR/releasekey" \
@@ -561,7 +561,7 @@ hardenLocationSerials() {
 	#Prevent Qualcomm location stack from sending chipset serial number
 
 	#Devices using blob xtra-daemon (which Deblob.sh removes)
-	if [[ "$DOS_VERSION" != "LineageOS-20.0" ]]; then #20.0 has sysfs_soc_sensitive label
+	if [[ "$DOS_VERSION" != "LineageOS-20.0" ]] && [[ "$DOS_VERSION" != "LineageOS-21.0" ]]; then #20.0+ has sysfs_soc_sensitive label
 		find device -name "hal_gnss*.te" -type f -exec sh -c "awk -i inplace '!/sysfs_soc/' {}" \;
 		find device -name "location.te" -type f -exec sh -c "awk -i inplace '!/sysfs_soc/' {}" \;
 	fi;
@@ -583,11 +583,6 @@ hardenLocationConf() {
 	#Debugging: adb logcat -b all | grep -i -e locsvc -e izat -e gps -e gnss -e location -e xtra
 	#sed -i 's|DEBUG_LEVEL = .|DEBUG_LEVEL = 4|' "$gpsConfig" &> /dev/null || true; #Debug
 	#sed -i 's|DEBUG_LEVEL = .|DEBUG_LEVEL = 2|' "$gpsConfig" &> /dev/null || true; #Warning
-	#Enable GLONASS
-	if [ "$DOS_GPS_GLONASS_FORCED" = true ]; then
-	sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT =/A_GLONASS_POS_PROTOCOL_SELECT =/' "$gpsConfig" &>/dev/null || true;
-	sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0.*/A_GLONASS_POS_PROTOCOL_SELECT = 15/' "$gpsConfig" &>/dev/null || true;
-	fi;
 	#Change capabilities
 	sed -i 's|CAPABILITIES=.*|CAPABILITIES=0x13|' "$gpsConfig" &> /dev/null || true; #Disable MSA (privacy) and geofencing/ULP (both broken by deblobber)
 	sed -i 's|CAPABILITIES = .*|CAPABILITIES = 0x13|' "$gpsConfig" &> /dev/null || true;
@@ -633,10 +628,6 @@ export -f hardenLocationConf;
 
 hardenLocationFWB() {
 	local dir=$1;
-	#Enable GLONASS
-	if [ "$DOS_GPS_GLONASS_FORCED" = true ]; then
-	sed -i 's|A_GLONASS_POS_PROTOCOL_SELECT=0.*</item>|A_GLONASS_POS_PROTOCOL_SELECT=15</item>|' "$dir"/frameworks/base/core/res/res/values*/*.xml &>/dev/null || true;
-	fi;
 	#Change capabilities
 	sed -i "s|SUPL_MODE=3|SUPL_MODE=1|" "$dir"/frameworks/base/core/res/res/values*/*.xml &> /dev/null || true; #Disable MSA (privacy)
 	sed -i "s|LPP_PROFILE=.*</item>|LPP_PROFILE=0</item>|" "$dir"/frameworks/base/core/res/res/values*/*.xml &> /dev/null || true; #Disable LPP (privacy)
@@ -669,7 +660,7 @@ hardenUserdata() {
 
 	#TODO: Ensure: noatime,nosuid,nodev
 	sed -i '/\/data/{/discard/!s|nosuid|discard,nosuid|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
-	if [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/amazon/hdx-common" ] && [ "$1" != "device/motorola/athene" ] && [[ "$DOS_VERSION" != "LineageOS-20.0" ]]; then #tuna needs first boot to init, hdx-c has broken encryption
+	if [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/amazon/hdx-common" ] && [ "$1" != "device/motorola/athene" ] && [[ "$DOS_VERSION" != "LineageOS-20.0" ]] && [[ "$DOS_VERSION" != "LineageOS-21.0" ]]; then #tuna needs first boot to init, hdx-c has broken encryption
 		sed -i 's|encryptable=/|forceencrypt=/|' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 	fi;
 	echo "Hardened /data for $1";
@@ -771,16 +762,6 @@ disableAPEX() {
 }
 export -f disableAPEX;
 
-enableStrongEncryption() {
-	cd "$DOS_BUILD_BASE/$1";
-	if [ -f BoardConfig.mk ]; then
-		echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk;
-		echo "Enabled AES-256 encryption for $1";
-	fi;
-	cd "$DOS_BUILD_BASE";
-}
-export -f enableStrongEncryption;
-
 addAdbKey() {
 	if [ -f ~/.android/adbkey.pub ]; then
 		cp ~/.android/adbkey.pub "$DOS_BUILD_BASE/vendor/divested/";
@@ -795,102 +776,24 @@ changeDefaultDNS() {
 	local dnsSecondary="";
 	local dnsSecondaryV6="";
 	if [ ! -z "$DOS_DEFAULT_DNS_PRESET" ]; then
-		if [[ "$DOS_DEFAULT_DNS_PRESET" == "AdGuard" ]]; then #https://adguard.com/en/adguard-dns/overview.html
-			dnsHex="0xb0678282L";
-			dnsPrimary="176.103.130.130";
-			dnsPrimaryV6="2a00:5a60::ad1:0ff";
-			dnsSecondary="176.103.130.131";
-			dnsSecondaryV6="2a00:5a60::ad2:0ff";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "AdGuard-NOBL" ]]; then #https://adguard.com/en/adguard-dns/overview.html
-			dnsHex="0xb0678288L";
-			dnsPrimary="176.103.130.136";
-			dnsPrimaryV6="2a00:5a60::01:ff";
-			dnsSecondary="176.103.130.137";
-			dnsSecondaryV6="2a00:5a60::02:ff";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "CensurfriDNS" ]]; then #https://uncensoreddns.org
-			dnsHex="0x5bef6464L";
-			dnsPrimary="91.239.100.100";
-			dnsPrimaryV6="2001:67c:28a4::";
-			dnsSecondary="89.233.43.71";
-			dnsSecondaryV6="2a01:3a0:53:53::";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Cloudflare" ]]; then #https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy
-			dnsHex="0x01000001L";
-			dnsPrimary="1.0.0.1";
-			dnsPrimaryV6="2606:4700:4700::1001";
-			dnsSecondary="1.1.1.1";
-			dnsSecondaryV6="2606:4700:4700::1111";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Cloudflare-BL" ]]; then #https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy
+		if [[ "$DOS_DEFAULT_DNS_PRESET" == "Cloudflare" ]]; then #https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy
 			dnsHex="0x01000002L";
 			dnsPrimary="1.0.0.2";
 			dnsPrimaryV6="2606:4700:4700::1002";
 			dnsSecondary="1.1.1.2";
 			dnsSecondaryV6="2606:4700:4700::1112";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "DNSWATCH" ]]; then #https://dns.watch
-			dnsHex="0x54c84550L";
-			dnsPrimary="84.200.69.80";
-			dnsPrimaryV6="2001:1608:10:25::1c04:b12f";
-			dnsSecondary="84.200.70.40";
-			dnsSecondaryV6="2001:1608:10:25::9249:d69b";
 		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Google" ]]; then #https://developers.google.com/speed/public-dns/privacy
 			dnsHex="0x08080808L";
 			dnsPrimary="8.8.8.8";
 			dnsPrimaryV6="2001:4860:4860::8888";
 			dnsSecondary="8.8.4.4";
 			dnsSecondaryV6="2001:4860:4860::8844";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Neustar" ]]; then #https://www.security.neustar/digital-performance/dns-services/recursive-dns
-			dnsHex="0x9c9a4602L";
-			dnsPrimary="156.154.70.2";
-			dnsPrimaryV6="2610:a1:1018::2";
-			dnsSecondary="156.154.71.2";
-			dnsSecondaryV6="2610:a1:1019::2";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Neustar-NOBL" ]]; then #https://www.security.neustar/digital-performance/dns-services/recursive-dns
-			dnsHex="0x9c9a4605L";
-			dnsPrimary="156.154.70.5";
-			dnsPrimaryV6="2610:a1:1018::5";
-			dnsSecondary="156.154.71.5";
-			dnsSecondaryV6="2610:a1:1019::5";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "OpenDNS" ]]; then #https://www.cisco.com/c/en/us/about/legal/privacy-full.html
-			dnsHex="0xd043dedeL";
-			dnsPrimary="208.67.222.222";
-			dnsPrimaryV6="2620:0:ccc::2";
-			dnsSecondary="208.67.220.220";
-			dnsSecondaryV6="2620:0:ccd::2";
 		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Quad9" ]]; then #https://www.quad9.net/privacy
 			dnsHex="0x09090909L";
 			dnsPrimary="9.9.9.9";
 			dnsPrimaryV6="2620:fe::fe";
 			dnsSecondary="149.112.112.112";
 			dnsSecondaryV6="2620:fe::9";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Quad9-EDNS" ]]; then #https://www.quad9.net/privacy
-			dnsHex="0x0909090bL";
-			dnsPrimary="9.9.9.11";
-			dnsPrimaryV6="2620:fe::11";
-			dnsSecondary="149.112.112.11";
-			dnsSecondaryV6="2620:fe::fe:11";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Quad9-NOBL" ]]; then #https://www.quad9.net/privacy
-			dnsHex="0x0909090aL";
-			dnsPrimary="9.9.9.10";
-			dnsPrimaryV6="2620:fe::10";
-			dnsSecondary="149.112.112.10";
-			dnsSecondaryV6="2620:fe::fe:10";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Verisign" ]]; then #https://www.verisign.com/en_US/security-services/public-dns/terms-of-service/index.xhtml
-			dnsHex="0x40064006L";
-			dnsPrimary="64.6.64.6";
-			dnsPrimaryV6="2620:74:1b::1:1";
-			dnsSecondary="64.6.65.6";
-			dnsSecondaryV6="2620:74:1c::2:2";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Yandex" ]]; then #https://dns.yandex.com/advanced
-			dnsHex="0x4d580858L";
-			dnsPrimary="77.88.8.88";
-			dnsPrimaryV6="2a02:6b8::feed:bad";
-			dnsSecondary="77.88.8.2";
-			dnsSecondaryV6="2a02:6b8:0:1::feed:bad";
-		elif [[ "$DOS_DEFAULT_DNS_PRESET" == "Yandex-NOBL" ]]; then #https://dns.yandex.com/advanced
-			dnsHex="0x4d580808L";
-			dnsPrimary="77.88.8.8";
-			dnsPrimaryV6="2a02:6b8::feed:0ff";
-			dnsSecondary="77.88.8.1";
-			dnsSecondaryV6="2a02:6b8:0:1::feed:0ff";
 		fi;
 	else
 		echo "You must first set a preset via the DOS_DEFAULT_DNS_PRESET variable in init.sh!";
@@ -910,7 +813,6 @@ export -f changeDefaultDNS;
 editKernelLocalversion() {
 	local defconfigPath=$(getDefconfig)
 	local replacement=$1;
-	if [ "$DOS_SNET" = true ]; then local replacement="-oink"; fi;
 	sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'"$replacement"'"/' $defconfigPath &>/dev/null || true;
 	sed -zi '/CONFIG_LOCALVERSION="'"$replacement"'"/!s/$/\nCONFIG_LOCALVERSION="'"$replacement"'"/' $defconfigPath &>/dev/null;
 }
@@ -1154,7 +1056,7 @@ hardenDefconfig() {
 	optionsNo+=("HARDENED_USERCOPY_FALLBACK");
 	optionsNo+=("SECURITY_SELINUX_DISABLE" "SECURITY_WRITABLE_HOOKS");
 	if [ "$DOS_USE_KSM" = false ]; then optionsNo+=("SLAB_MERGE_DEFAULT"); fi;
-	if [[ "$DOS_VERSION" != "LineageOS-20.0" ]]; then optionsNo+=("USERFAULTFD"); fi;
+	if [[ "$DOS_VERSION" != "LineageOS-20.0" ]] && [[ "$DOS_VERSION" != "LineageOS-21.0" ]]; then optionsNo+=("USERFAULTFD"); fi;
 	#optionsNo+=("CFI_PERMISSIVE");
 	#misc
 	optionsNo+=("FB_MSM_MDSS_XLOG_DEBUG" "MSM_BUSPM_DEV" "MSMB_CAMERA_DEBUG" "MSM_CAMERA_DEBUG" "MSM_SMD_DEBUG");
@@ -1170,15 +1072,13 @@ hardenDefconfig() {
 	#optionsNo+=("PROC_PAGE_MONITOR"); #breaks memory stats
 	#optionsNo+=("SCHED_DEBUG"); #breaks compile
 
-	if [ "$DOS_DEFCONFIG_DISABLER" = true ]; then
-		for option in "${optionsNo[@]}"
-		do
-			#If the option is enabled, disable it
-			sed -i 's/CONFIG_'"$option"'=y/CONFIG_'"$option"'=n/' $defconfigPath &>/dev/null || true;
-			#If the option isn't present, add it disabled
-			sed -zi '/CONFIG_'"$option"'=n/!s/$/\nCONFIG_'"$option"'=n/' $defconfigPath &>/dev/null || true;
-		done
-	fi;
+	for option in "${optionsNo[@]}"
+	do
+		#If the option is enabled, disable it
+		sed -i 's/CONFIG_'"$option"'=y/CONFIG_'"$option"'=n/' $defconfigPath &>/dev/null || true;
+		#If the option isn't present, add it disabled
+		sed -zi '/CONFIG_'"$option"'=n/!s/$/\nCONFIG_'"$option"'=n/' $defconfigPath &>/dev/null || true;
+	done
 
 	#Extras
 	sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=8/CONFIG_ARCH_MMAP_RND_BITS=16/' $defconfigPath &>/dev/null || true;
diff --git a/Scripts/Generate_Verified_Boot_Hashes.sh b/Scripts/Generate_Verified_Boot_Hashes.sh
index c5b055e1..f1d106fa 100644
--- a/Scripts/Generate_Verified_Boot_Hashes.sh
+++ b/Scripts/Generate_Verified_Boot_Hashes.sh
@@ -51,8 +51,6 @@ do
 	if [[ " ${AVB_DEVICES[@]} " =~ " ${device} " ]]; then
 		echo "Device: $device";
 		sha256=$(cat $f | openssl dgst -sha256 | sed 's/SHA2-256(stdin)= //' | tr [a-z] [A-Z]);
-		#echo -e "\tID:"; #Not really needed
-		#echo -e "\t\t${sha256:0:8}";
 		echo -e "\tSHA-256:";
 		echo -e "\t\t${sha256:0:16}";
 		echo -e "\t\t${sha256:16:16}";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 7d399ee5..3b9bc55c 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -100,8 +100,7 @@ applyPatch "$DOS_PATCHES/android_external_apache-http/0001-Fix.patch"; #Fix comp
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/expat"; then
@@ -118,10 +117,10 @@ fi;
 
 #if [ "$DOS_GRAPHENE_MALLOC_STAGING" = true ]; then
 #if enterAndClear "external/hardened_malloc"; then
-#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
-#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
+#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+#applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
 #sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 #sed -i -e '76,78d;' Android.bp; #fix compile under A13
 #sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
@@ -608,10 +607,6 @@ applyPatch "$DOS_PATCHES/android_system_sepolicy/248600.patch"; #Restrict access
 applyPatch "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices (DivestOS)
 fi;
 
-if enterAndClear "system/vold"; then
-applyPatch "$DOS_PATCHES/android_system_vold/0001-AES256.patch"; #Add a variable for enabling AES-256 bit encryption (DivestOS)
-fi;
-
 if enterAndClear "vendor/cm"; then
 rm build/target/product/security/lineage.x509.pem; #Remove Lineage keys
 rm -rf overlay/common/vendor/cmsdk/packages; #Remove analytics
@@ -728,7 +723,6 @@ find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c
 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 #find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
-if [ "$DOS_STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableStrongEncryption "{}"'; fi;
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 cd "$DOS_BUILD_BASE";
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index 7856ffdd..318d883d 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -58,8 +58,8 @@ sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' res/values*/stri
 fi;
 
 if enter "packages/apps/Updater"; then
-sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i 's|https://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml;
 fi;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 16894e05..b41eee95 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -57,12 +57,10 @@ cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/di
 
 if enterAndClear "bionic"; then
 applyPatch "$DOS_PATCHES_COMMON/android_bionic/0001-Wildcard_Hosts.patch"; #Support wildcards in cached hosts file (backport from 16.0+) (tdm)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0002-Add_M_PURGE.patch"; #malloc: add M_PURGE mallopt flag
 applyPatch "$DOS_PATCHES/android_bionic/0003-Add_random.h.patch"; #Add <sys/random.h>.
 fi;
-fi;
 
 if enterAndClear "bootable/recovery"; then
 git revert --no-edit eb98fde70a6e54a25408eb8c626caecf7841c5df; #Remove sideload cache, breaks with large files
@@ -100,8 +98,7 @@ applyPatch "$DOS_PATCHES/android_external_aac/364027.patch"; #R_asb_2023-08 Incr
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/dtc"; then
@@ -121,12 +118,11 @@ if enterAndClear "external/freetype"; then
 applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
@@ -142,7 +138,6 @@ awk -i inplace '!/system_shared_libs/' Android.bp; #fix compile under A9
 sed -i 's/c17/c11/' Android.bp; #fix compile under A9
 sed -i 's/struct mallinfo info = {0};/struct mallinfo info = {};/' h_malloc.c; #fix compile under A8
 fi;
-fi;
 
 if enterAndClear "external/libvpx"; then
 applyPatch "$DOS_PATCHES_COMMON/android_external_libvpx/CVE-2023-5217.patch"; #VP8: disallow thread count changes
@@ -169,7 +164,7 @@ applyPatch "$DOS_PATCHES/android_external_zlib/351909.patch"; #P_asb_2023-03 Fix
 fi;
 
 if enterAndClear "frameworks/av"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_av/358729.patch"; #n-asb-2023-06 Fix NuMediaExtractor::readSampleData buffer Handling
 applyPatch "$DOS_PATCHES/android_frameworks_av/365962.patch"; #R_asb_2023-09 Fix Segv on unknown address error flagged by fuzzer test.
 applyPatch "$DOS_PATCHES/android_frameworks_av/373949.patch"; #R_asb_2023-11 Fix for heap buffer overflow issue flagged by fuzzer test.
@@ -551,7 +546,7 @@ applyPatch "$DOS_PATCHES/android_system_core/332765.patch"; #P_asb_2022-06 Backp
 if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/hosts; fi; #Merge in our HOSTS file
 git revert --no-edit a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4; #Always update recovery
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "system/netd"; then
@@ -571,10 +566,6 @@ git am "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user b
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";
 fi;
 
-if enterAndClear "system/vold"; then
-applyPatch "$DOS_PATCHES/android_system_vold/0001-AES256.patch"; #Add a variable for enabling AES-256 bit encryption (DivestOS)
-fi;
-
 if enterAndClear "vendor/nxp/opensource/external/libnfc-nci"; then #keep in sync with system/nfc
 applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332771.patch"; #P_asb_2022-06 Double Free in ce_t4t_data_cback
 applyPatch "$DOS_PATCHES/android_vendor_nxp_opensource_external_libnfc-nci/332458-backport.patch"; #n-asb-2022-06 Out of Bounds Read in nfa_dm_check_set_config
@@ -628,7 +619,6 @@ find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c
 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
-if [ "$DOS_STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableStrongEncryption "{}"'; fi;
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 cd "$DOS_BUILD_BASE";
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 405bded4..6209b27c 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -69,8 +69,8 @@ sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' res/values*/stri
 fi;
 
 if enter "packages/apps/Updater"; then
-sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i 's|https://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml;
 fi;
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index aa48079e..8c5954d3 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -56,12 +56,11 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bionic"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
+applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -77,7 +76,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-9.patch";
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-13.patch"; #Add XOR mangling mitigation for thread-local dtors (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-14.patch"; #Use a better pthread_attr junk filling pattern (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-15.patch"; #Move pthread_internal_t out of the stack mapping (GrapheneOS)
-fi;
 #applyPatch "$DOS_PATCHES/android_bionic/0004-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
 fi;
 
@@ -117,12 +115,11 @@ applyPatch "$DOS_PATCHES/android_external_aac/364605.patch"; #P_asb_2023-08 Incr
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "external/dtc"; then
@@ -144,12 +141,11 @@ applyPatch "$DOS_PATCHES/android_external_freetype/361250.patch"; #P_asb_2023-07
 applyPatch "$DOS_PATCHES/android_external_freetype/364606.patch"; #P_asb_2023-08 Cherrypick following three changes
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
@@ -164,7 +160,6 @@ awk -i inplace '!/recovery_available/' Android.bp; #fix compile under A9
 awk -i inplace '!/system_shared_libs/' Android.bp; #fix compile under A9
 sed -i 's/c17/c11/' Android.bp; #fix compile under A9
 fi;
-fi;
 
 if enterAndClear "external/libcups"; then
 git fetch https://github.com/LineageOS/android_external_libcups refs/changes/32/374932/1 && git cherry-pick FETCH_HEAD; #P_asb_2023-11 Upgrade libcups to v2.3.1
@@ -205,7 +200,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_av/379788.patch"; #P_asb_2024-01 Fix
 applyPatch "$DOS_PATCHES/android_frameworks_av/383562.patch"; #P_asb_2024-02 Update mtp packet buffer
 applyPatch "$DOS_PATCHES/android_frameworks_av/385670.patch"; #P_asb_2024-03 Validate OMX Params for VPx encoders
 applyPatch "$DOS_PATCHES/android_frameworks_av/385671.patch"; #P_asb_2024-03 Fix out of bounds read and write in onQueueFilled in outQueue
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/base"; then
@@ -328,7 +323,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/389270.patch"; #P_asb_2024-04 F
 applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-3.patch";
@@ -341,7 +335,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-9.patc
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-10.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-11.patch";
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS)
@@ -352,10 +345,9 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Network_Permission-2.patch
 applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Sensors_Permission.patch"; #Add special runtime permission for other sensors (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0016-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0014-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-#if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Unprivileged_microG_Handling.patch"; fi; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0014-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
+#applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS)
-if [ "$DOS_SNET" = true ]; then git am "$DOS_PATCHES/android_frameworks_base/snet-16.patch"; fi;
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
 sed -i 's/DEFAULT_MAX_FILES_LOWRAM = 300;/DEFAULT_MAX_FILES_LOWRAM = 0;/' services/core/java/com/android/server/DropBoxManagerService.java;
 sed -i 's/(notif.needNotify)/(true)/' location/java/com/android/internal/location/GpsNetInitiatedHandler.java; #Notify the user if their location is requested via SUPL
@@ -388,7 +380,7 @@ fi;
 fi;
 
 if enterAndClear "frameworks/opt/net/wifi"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/opt/telephony"; then
@@ -442,7 +434,7 @@ fi;
 
 if enterAndClear "libcore"; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "lineage-sdk"; then
@@ -456,7 +448,7 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/332759.patch"; #P_asb_2
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/345907.patch"; #P_asb_2022-12 Fix URI check in BluetoothOppUtility.java
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/349332.patch"; #P_asb_2023-02 Fix OPP comparison
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/377774.patch"; #P_asb_2023-12 Fix UAF in ~CallbackEnv
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/Car/Settings"; then
@@ -501,7 +493,7 @@ fi;
 if enterAndClear "packages/apps/Nfc"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/332762.patch"; #P_asb_2022-06 OOB read in phNciNfc_RecvMfResp()
 applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/347043.patch"; #P_asb_2023-01 OOBW in Mfc_Transceive()
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/PackageInstaller"; then
@@ -537,9 +529,9 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0001-Captive_Portal_Togg
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-#if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+#applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0012-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (heavily based off of a GrapheneOS patch)
-#if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+#applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 64;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase default max password length to 64 (GrapheneOS)
 sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service
 fi;
@@ -587,7 +579,6 @@ if enterAndClear "packages/providers/TelephonyProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/344182.patch"; #P_asb_2022-11 Check dir path before updating permissions.
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/364616.patch"; #P_asb_2023-08 Update file permissions using canonical path
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/374920.patch"; #P_asb_2023-11 Block access to sms/mms db from work profile.
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/;
 fi;
 
 if enterAndClear "packages/services/BuiltInPrintService"; then
@@ -675,10 +666,9 @@ applyPatch "$DOS_PATCHES/android_system_core/332765.patch"; #P_asb_2022-06 Backp
 if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/hosts; fi; #Merge in our HOSTS file
 git revert --no-edit b3609d82999d23634c5e6db706a3ecbc5348309a; #Always update recovery
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-Zero_Sensitive_Info.patch"; fi; #Zero sensitive information with explicit_bzero (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0003-Zero_Sensitive_Info.patch"; #Zero sensitive information with explicit_bzero (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_system_core/0004-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_SNET_EXTRA" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/snet-16.patch"; fi;
 fi;
 
 if enterAndClear "system/extras"; then
@@ -781,7 +771,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {}
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh
index 99641e50..fd34224f 100644
--- a/Scripts/LineageOS-16.0/Rebrand.sh
+++ b/Scripts/LineageOS-16.0/Rebrand.sh
@@ -69,8 +69,8 @@ sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' res/values*/stri
 fi;
 
 if enter "packages/apps/Updater"; then
-sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i 's|https://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml;
 fi;
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index ab2e4709..c93bc10e 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -56,7 +56,7 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bootable/recovery"; then
@@ -64,9 +64,8 @@ applyPatch "$DOS_PATCHES/android_bootable_recovery/0001-No_SerialNum_Restriction
 fi;
 
 if enterAndClear "bionic"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0002-Symbol_Ordering.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
+applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_bionic/0002-Symbol_Ordering.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -84,7 +83,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-9.patch";
 #applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-15.patch"; #Add guard page(s) between static_tls and stack (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-16.patch"; #Move pthread_internal_t behind guard page (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0003-Graphene_Bionic_Hardening-17.patch"; #Add secondary stack randomization (GrapheneOS)
-fi;
 applyPatch "$DOS_PATCHES/android_bionic/0004-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
 fi;
 
@@ -97,7 +95,6 @@ applyPatch "$DOS_PATCHES_COMMON/android_build/0001-verity-openssl3.patch"; #Fix
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
-#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
 sed -i 's/2023-02-05/2024-05-05/' core/version_defaults.mk; #Bump Security String #x_asb_2024-05
 fi;
 
@@ -116,12 +113,11 @@ applyPatch "$DOS_PATCHES/android_external_aac/365445.patch"; #Q_asb_2023-08 Incr
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "external/freetype"; then
@@ -130,12 +126,11 @@ applyPatch "$DOS_PATCHES/android_external_freetype/365446.patch"; #Q_asb_2023-08
 applyPatch "$DOS_PATCHES/android_external_freetype/378047.patch"; #Q_asb_2023-12 Make `glyph_name' parameter to `FT_Get_Name_Index' a `const'.
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0003-Broken_Audio.patch"; #Workaround for audio service sorting bug (GrapheneOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
@@ -146,7 +141,6 @@ awk -i inplace '!/ramdisk_available/' Android.bp; #fix compile under A10
 git revert --no-edit 8974af86d12f7e29b54b5090133ab3d7eea0e519; #fix compile under A10
 mv include/h_malloc.h  . ; #fix compile under A10
 fi;
-fi;
 
 if enterAndClear "external/libcups"; then
 git fetch https://github.com/LineageOS/android_external_libcups refs/changes/95/376595/1 && git cherry-pick FETCH_HEAD; #Q_asb_2023-11 Upgrade libcups to v2.3.1
@@ -304,7 +298,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/392205.patch"; #Q_asb_2024-04 F
 applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch"; #Allow SystemUI to directly manage Bluetooth/WiFi (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-3.patch";
@@ -319,7 +312,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-11.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-12.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0010-Exec_Based_Spawning-13.patch";
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0005-User_Logout.patch"; #Allow user logout (GrapheneOS)
@@ -336,14 +328,13 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0014-Sensors_Permission.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0016-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0017-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0018-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0018-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0019-Random_MAC.patch"; #Add option of always randomizing MAC addresses (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-SUPL_Toggle.patch"; #Add a setting for forcibly disabling SUPL (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Unprivileged_microG_Handling.patch"; fi; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly (DivestOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS)
-if [ "$DOS_SNET" = true ]; then git am "$DOS_PATCHES/android_frameworks_base/snet-17.patch"; fi;
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
 sed -i 's/DEFAULT_MAX_FILES_LOWRAM = 300;/DEFAULT_MAX_FILES_LOWRAM = 0;/' services/core/java/com/android/server/DropBoxManagerService.java;
 sed -i 's/(notif.needNotify)/(true)/' location/java/com/android/internal/location/GpsNetInitiatedHandler.java; #Notify the user if their location is requested via SUPL
@@ -377,7 +368,7 @@ if enterAndClear "frameworks/opt/net/wifi"; then
 applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/352562.patch"; #Q_asb_2023-03 Revert "wifi: remove certificates for network factory reset"
 applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/355360.patch"; #Q_asb_2023-04 Revert "Revert "wifi: remove certificates for network factory reset""
 applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/378139.patch"; #Q_asb_2023-07 Limit the number of Passpoint per App
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_opt_net_wifi/0002-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)
 fi;
 
@@ -423,12 +414,10 @@ applyPatch "$DOS_PATCHES/android_hardware_qcom_audio/0001-Unused-sm8150.patch";
 fi;
 
 if enterAndClear "libcore"; then
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0001-Exec_Based_Spawning-2.patch";
-fi;
 applyPatch "$DOS_PATCHES/android_libcore/0003-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0004-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_libcore/0004-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "lineage-sdk"; then
@@ -440,7 +429,7 @@ if enterAndClear "packages/apps/Bluetooth"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/378135.patch"; #Q_asb_2023-12 Fix UAF in ~CallbackEnv
 #applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/272652.patch"; #ten-bt-sbc-hd-dualchannel: SBC Dual Channel (SBC HD Audio) support (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/272653.patch"; #ten-bt-sbc-hd-dualchannel: Assume optional codecs are supported if were supported previously (ValdikSS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/Camera2"; then
@@ -451,11 +440,6 @@ if enterAndClear "packages/apps/Car/Settings"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_Car_Settings/378111.patch"; #Q_asb_2023-06 Convert argument to Intent in car settings AddAccountActivity.
 fi;
 
-#if enterAndClear "packages/apps/CarrierConfig"; then
-#rm -rf assets/*.xml;
-#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
-#fi;
-
 if enterAndClear "packages/apps/Contacts"; then
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0002-No_Google_Backup.patch"; #Backups are not sent to Google (GrapheneOS)
@@ -482,7 +466,7 @@ fi;
 if enterAndClear "packages/apps/Nfc"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/368010.patch"; #Q_asb_2023-09 Ensure that SecureNFC setting cannot be bypassed
 applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/380568.patch"; #Q_asb_2024-01 Possible deadlock on the NfcService object
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/PermissionController"; then
@@ -515,13 +499,13 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.pa
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch"; #Timeout for Wi-Fi (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-Random_MAC-1.patch"; #Add option to always randomize MAC (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-Random_MAC-2.patch"; #Remove partial MAC randomization translations (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-LTE_Only_Mode.patch"; #Add LTE-only option (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0012-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-SUPL_Toggle.patch"; #Add a toggle for forcibly disabling SUPL (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Settings/0001-disable_apps.patch"; #Add an ability to disable non-system apps from the "App info" screen (GrapheneOS)
 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 64;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase default max password length to 64 (GrapheneOS)
 sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service
@@ -576,7 +560,6 @@ fi;
 if enterAndClear "packages/providers/TelephonyProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/365458.patch"; #Q_asb_2023-08 Update file permissions using canonical path
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/376605.patch"; #Q_asb_2023-11 Block access to sms/mms db from work profile.
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/;
 fi;
 
 if enterAndClear "packages/services/BuiltInPrintService"; then
@@ -648,10 +631,9 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/h
 git revert --no-edit 3032c7aa5ce90c0ae9c08fe271052c6e0304a1e7 01266f589e6deaef30b782531ae14435cdd2f18e; #insanity
 git revert --no-edit bd4142eab8b3cead0c25a2e660b4b048d1315d3c; #Always update recovery
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-Zero_Sensitive_Info.patch"; fi; #Zero sensitive information with explicit_bzero (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0003-Zero_Sensitive_Info.patch"; #Zero sensitive information with explicit_bzero (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_core/0004-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_SNET_EXTRA" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/snet-17.patch"; fi;
 fi;
 
 if enterAndClear "system/extras"; then
@@ -832,7 +814,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {}
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh
index 2eae1f4e..e6351d4d 100644
--- a/Scripts/LineageOS-17.1/Rebrand.sh
+++ b/Scripts/LineageOS-17.1/Rebrand.sh
@@ -76,8 +76,8 @@ sed -i '/.*setup_services/s/LineageOS/'"$DOS_BRANDING_NAME"'/g' res/values*/stri
 fi;
 
 if enter "packages/apps/Updater"; then
-sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i 's|https://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml;
 fi;
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 1f8af21f..ab1c6519 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -118,7 +118,6 @@ patchWorkspaceReal() {
 	source build/envsetup.sh;
 	#repopick -it eleven-firewall;
 	#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
-	#repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default
 	repopick -fit msm8974-display-r;
 	repopick -fit msm8974-gps-r;
 	repopick -fit hh-vsync;
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 78c447c6..b6f06578 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -56,12 +56,11 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bionic"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
+applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -78,7 +77,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-9.patch";
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-14.patch"; #Add guard page(s) between static_tls and stack (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-15.patch"; #Move pthread_internal_t behind guard page (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-16.patch"; #Add secondary stack randomization (GrapheneOS)
-fi;
 applyPatch "$DOS_PATCHES/android_bionic/0003-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
 fi;
 
@@ -90,18 +88,17 @@ if enterAndClear "build/make"; then
 git revert --no-edit def3f14af17ae92192d2cc7d22349cabfa906fd6; #Re-enable the downgrade check
 applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification (DivestOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
+applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
 applyPatch "$DOS_PATCHES_COMMON/android_build/0001-verity-openssl3.patch"; #Fix VB 1.0 failure due to openssl output format change
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
-#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
 sed -i 's/2024-02-05/2024-05-05/' core/version_defaults.mk; #Bump Security String #x_asb_2024-04
 fi;
 
 if enterAndClear "build/soong"; then
 applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "device/qcom/sepolicy-legacy"; then
@@ -110,26 +107,23 @@ echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #Ignore neverallow vio
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
 awk -i inplace '!/vendor_ramdisk_available/' Android.bp; #fix compile under A11
 rm -rfv androidtest; #fix compile under A11
 fi;
-fi;
 
 if enterAndClear "external/sonivox"; then
 applyPatch "$DOS_PATCHES_COMMON/android_external_sonivox/391896.patch"; #n-asb-2024-05 Fix buffer overrun in eas_wtengine
@@ -171,8 +165,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Sensors_Permission.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0014-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0016-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-3.patch";
@@ -187,18 +180,16 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-11.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-12.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-13.patch";
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0019-Random_MAC.patch"; #Add option of always randomizing MAC addresses (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Burnin_Protection.patch"; #SystemUI: add burnIn protection (arter97)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0021-SUPL_Toggle.patch"; #Add a setting for forcibly disabling SUPL (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0023-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0024-Unprivileged_microG_Handling.patch"; fi; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0024-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0025-tile_restrictions.patch"; #SystemUI: Require unlocking to use sensitive QS tiles (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0006-Do-not-throw-in-setAppOnInterfaceLocked.patch"; #Fix random reboots on broken kernels when an app has data restricted XXX: ugly (DivestOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS)
-if [ "$DOS_SNET" = true ]; then git am "$DOS_PATCHES/android_frameworks_base/snet-18.patch"; fi;
 hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
 sed -i 's/DEFAULT_USE_FREEZER = false;/DEFAULT_USE_FREEZER = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app freezer by default (GrapheneOS)
@@ -215,7 +206,7 @@ rm -rf packages/PrintRecommendationService; #Creates popups to install proprieta
 fi;
 
 if enterAndClear "frameworks/ex"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/native"; then
@@ -288,12 +279,10 @@ fi;
 
 if enterAndClear "libcore"; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-2.patch";
 fi;
-fi;
 
 if enterAndClear "lineage-sdk"; then
 awk -i inplace '!/LineageWeatherManagerService/' lineage/res/res/values/config.xml; #Disable Weather
@@ -301,14 +290,9 @@ if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAud
 fi;
 
 if enterAndClear "packages/apps/Bluetooth"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-#if enterAndClear "packages/apps/CarrierConfig"; then
-#rm -rf assets/*.xml;
-#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
-#fi;
-
 if enterAndClear "packages/apps/Contacts"; then
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0002-No_Google_Backup.patch"; #Backups are not sent to Google (GrapheneOS)
@@ -333,7 +317,7 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Messaging/0002-missing-cha
 fi;
 
 if enterAndClear "packages/apps/Nfc"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/PermissionController"; then
@@ -356,7 +340,7 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.pa
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch"; #Timeout for Wi-Fi (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC-1.patch"; #Add option to always randomize MAC (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC-2.patch"; #Remove partial MAC randomization translations (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-Install_Restrictions.patch"; #UserManager app installation restrictions (GrapheneOS)
@@ -365,7 +349,7 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-LTE_Only_Mode-1.pat
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-LTE_Only_Mode-2.patch"; #Show preferred network options no matter the carrier configuration (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-LTE_Only_Mode-3.patch"; #Add LTE only entry when carrier enables world mode (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-SUPL_Toggle.patch"; #Add a toggle for forcibly disabling SUPL (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0015-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0015-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Settings/0001-disable_apps.patch"; #Add an ability to disable non-system apps from the "App info" screen (GrapheneOS)
 sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service
 fi;
@@ -407,7 +391,6 @@ fi;
 if enterAndClear "packages/providers/TelephonyProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/304614.patch"; #mcc/mnc fix (Sony)
 applyPatch "$DOS_PATCHES/android_packages_providers_TelephonyProvider/312102.patch"; #mnc fix (Sony)
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/latest_carrier_id/;
 fi;
 
 if enterAndClear "system/bt"; then
@@ -428,9 +411,8 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/h
 git revert --no-edit e8dcabaf6b55ec55eb73c4585501ddbafc04fc9b 79f606ece6b74652d374eb4f79de309a0aa81360; #insanity
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_core/0002-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0004-Zero_Sensitive_Info.patch"; fi; #Zero sensitive information with explicit_bzero (GrapheneOS)
-if [ "$DOS_SNET_EXTRA" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/snet-18.patch"; fi;
+applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0004-Zero_Sensitive_Info.patch"; #Zero sensitive information with explicit_bzero (GrapheneOS)
 fi;
 
 if enterAndClear "system/extras"; then
@@ -623,7 +605,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {}
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
diff --git a/Scripts/LineageOS-18.1/Rebrand.sh b/Scripts/LineageOS-18.1/Rebrand.sh
index b4c0a4b7..96aac460 100644
--- a/Scripts/LineageOS-18.1/Rebrand.sh
+++ b/Scripts/LineageOS-18.1/Rebrand.sh
@@ -87,8 +87,8 @@ if [ "$DOS_OTA_SERVER_EXTENDED" = true ]; then
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_PRIMARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_PRIMARY"'|' res/xml/network_security_config.xml;
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_SECONDARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_SECONDARY"'|' res/xml/network_security_config.xml;
 else
-	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 fi;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml;
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 2e3f0831..5ad1901b 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -68,7 +68,6 @@ patchWorkspaceReal() {
 
 	#source build/envsetup.sh;
 	#repopick -ift twelve-bt-sbc-hd-dualchannel;
-	#repopick -it twelve-colors;
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
@@ -80,10 +79,6 @@ patchWorkspaceReal() {
 	sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
 	sh "$DOS_SCRIPTS_COMMON/Post.sh";
 	source build/envsetup.sh;
-
-	#Deblobbing fixes
-	##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
-	#none yet
 }
 export -f patchWorkspaceReal;
 
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index a9a6e981..7abb846c 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -56,12 +56,11 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bionic"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
+applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -78,7 +77,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-11.patch"
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-14.patch"; #Add guard page(s) between static_tls and stack (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-15.patch"; #Move pthread_internal_t behind guard page (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-16.patch"; #Add secondary stack randomization (GrapheneOS)
-fi;
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Cache.patch"; #Sort and cache hosts file data for fast lookup (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Wildcards.patch"; #Support wildcards in cached hosts file (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0004-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
@@ -92,39 +90,35 @@ if enterAndClear "build/make"; then
 git revert --no-edit 7f4b9a43f3c49a5a896dd4951be0a96584751f46; #Re-enable the downgrade check
 applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification (DivestOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
+applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
 applyPatch "$DOS_PATCHES_COMMON/android_build/0001-verity-openssl3.patch"; #Fix VB 1.0 failure due to openssl output format change
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
-#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
 sed -i 's/2024-04-05/2024-05-05/' core/version_defaults.mk; #Bump Security String #x_asb_2024-05
 fi;
 
 if enterAndClear "build/soong"; then
 applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
 fi;
-fi;
 
 if enterAndClear "external/SecureCamera"; then
 sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name
@@ -156,8 +150,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0013-Sensors_Permission.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0014-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0016-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-3.patch";
@@ -172,7 +165,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-11.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-12.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-13.patch";
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Boot_Animation.patch"; #Use basic boot animation (DivestOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Ignore_StatementService_ANR.patch"; #Don't report statementservice crashes (GrapheneOS)
@@ -186,12 +178,11 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0027-appops_reset_fix-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0028-SUPL_Toggle.patch"; #Add a setting for forcibly disabling SUPL (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0030-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0031-Unprivileged_microG_Handling.patch"; fi; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0031-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0032-tile_restrictions.patch"; #SystemUI: Require unlocking to use sensitive QS tiles (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0033-minimal_screenshot_exif.patch"; #Put bare minimum metadata in screenshots (CalyxOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS)
-if [ "$DOS_SNET" = true ]; then git am "$DOS_PATCHES/android_frameworks_base/snet-19.patch"; fi;
 hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox internal logging service
@@ -207,7 +198,7 @@ rm -rf packages/PrintRecommendationService; #Creates popups to install proprieta
 fi;
 
 if enterAndClear "frameworks/ex"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/libs/net"; then
@@ -263,26 +254,19 @@ fi;
 
 if enterAndClear "libcore"; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-2.patch";
 fi;
-fi;
 
 if enterAndClear "lineage-sdk"; then
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi; #Remove AudioFX
 fi;
 
 if enterAndClear "packages/apps/Bluetooth"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-#if enterAndClear "packages/apps/CarrierConfig"; then
-#rm -rf assets/*.xml;
-#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
-#fi;
-
 if enterAndClear "packages/apps/Contacts"; then
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0002-No_Google_Backup.patch"; #Backups are not sent to Google (GrapheneOS)
@@ -308,7 +292,7 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Messaging/0002-missing-cha
 fi;
 
 if enterAndClear "packages/apps/Nfc"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/Settings"; then
@@ -318,14 +302,14 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.pa
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch"; #Timeout for Wi-Fi (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC.patch"; #Add option to always randomize MAC (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-Install_Restrictions.patch"; #UserManager app installation restrictions (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0012-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-Captive_Portal_Toggle.patch"; #Add option to disable captive portal checks (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-LTE_Only_Mode.patch"; #Add LTE only setting (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0015-SUPL_Toggle.patch"; #Add a toggle for forcibly disabling SUPL (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Settings/0001-disable_apps.patch"; #Add an ability to disable non-system apps from the "App info" screen (GrapheneOS)
 sed -i 's/if (isFullDiskEncrypted()) {/if (false) {/' src/com/android/settings/accessibility/*AccessibilityService*.java; #Never disable secure start-up when enabling an accessibility service
 fi;
@@ -395,10 +379,6 @@ if enterAndClear "packages/providers/DownloadProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
 fi;
 
-#if enterAndClear "packages/providers/TelephonyProvider"; then
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/latest_carrier_id/;
-#fi;
-
 if enterAndClear "system/bt"; then
 applyPatch "$DOS_PATCHES_COMMON/android_system_bt/0001-alloc_size.patch"; #Add alloc_size attributes to the allocator (GrapheneOS)
 fi;
@@ -413,8 +393,7 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/h
 git revert --no-edit 07adb89d0f8c966c88869d1abffc57da0e707568; #insanity
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_core/0002-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
-if [ "$DOS_SNET_EXTRA" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/snet-19.patch"; fi;
+applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "system/extras"; then
@@ -496,7 +475,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {}
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
diff --git a/Scripts/LineageOS-19.1/Rebrand.sh b/Scripts/LineageOS-19.1/Rebrand.sh
index 8ad85351..e1399dec 100644
--- a/Scripts/LineageOS-19.1/Rebrand.sh
+++ b/Scripts/LineageOS-19.1/Rebrand.sh
@@ -87,8 +87,8 @@ if [ "$DOS_OTA_SERVER_EXTENDED" = true ]; then
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_PRIMARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_PRIMARY"'|' res/xml/network_security_config.xml;
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_SECONDARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_SECONDARY"'|' res/xml/network_security_config.xml;
 else
-	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
-	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' src/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' src/org/lineageos/updater/misc/Utils.java;
 fi;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml;
 sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml;
diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh
index c3c6012a..9286f878 100644
--- a/Scripts/LineageOS-20.0/Functions.sh
+++ b/Scripts/LineageOS-20.0/Functions.sh
@@ -33,7 +33,6 @@ export -f scanWorkspaceForMalware;
 buildDevice() {
 	cd "$DOS_BUILD_BASE";
 	if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then
-		#export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1";
 		breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2;
 	else
 		echo -e "\e[0;31mNo signing keys available for $1\e[0m";
@@ -43,7 +42,6 @@ export -f buildDevice;
 
 buildDeviceDebug() {
 	cd "$DOS_BUILD_BASE";
-	unset OTA_KEY_OVERRIDE_DIR;
 	brunch "lineage_$1-eng";
 }
 export -f buildDeviceDebug;
@@ -176,10 +174,6 @@ patchWorkspaceReal() {
 			sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
 			sh "$DOS_SCRIPTS_COMMON/Post.sh";
 			source build/envsetup.sh;
-
-			#Deblobbing fixes
-			##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
-			#none yet
 		else
 			echo -e "\e[0;33mWARNING: CHECKOUT INCORRECT, NOT PATCHING!\e[0m";
 			echo "Please apply Patches/LineageOS-20.0/android/0001-tensor.patch to .repo/manifests and sync";
diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh
index 0de0c5e8..5c33520d 100644
--- a/Scripts/LineageOS-20.0/Patch.sh
+++ b/Scripts/LineageOS-20.0/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -57,12 +57,11 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bionic"; then
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS)
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
+applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -79,7 +78,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-11.patch"
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-14.patch"; #Add guard page(s) between static_tls and stack (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-15.patch"; #Move pthread_internal_t behind guard page (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-16.patch"; #Add secondary stack randomization (GrapheneOS)
-fi;
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Cache.patch"; #Sort and cache hosts file data for fast lookup (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Wildcards.patch"; #Support wildcards in cached hosts file (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0004-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
@@ -92,37 +90,32 @@ fi;
 if enterAndClear "build/make"; then
 git revert --no-edit 9b41333a849d14683f9c4ac30fcfd48a27945018; #Re-enable the downgrade check
 applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-#applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification (DivestOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
+applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
 applyPatch "$DOS_PATCHES/android_build/0004-Selective_APEX.patch"; #Only enable APEX on 6th/7th gen Pixel devices (GrapheneOS)
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_util.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
-#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
 fi;
 
 if enterAndClear "build/soong"; then
 applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 fi;
-fi;
 
 if enterAndClear "frameworks/av"; then
 git am $DOS_PATCHES/ASB-2023-10/av-*.patch;
@@ -153,8 +146,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0015-System_Server_Extensions.p
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout-Fix.patch"; #bugfix: Bluetooth auto turn off ignored connected BLE devices (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-2.patch"; #Disable exec spawning when using debugging options (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-3.patch"; #Add parameter for avoiding full preload with exec (GrapheneOS)
@@ -170,7 +162,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-12.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-13.patch"; #exec spawning: don't close the binder connection when the app crashes (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-14.patch"; #exec spawning: support runtime resource overlays (GrapheneOS)
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Ignore_StatementService_ANR.patch"; #Don't report statementservice crashes (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/326692.patch"; #Skip screen on animation when wake and unlock via biometrics (jesec) #TODO: 20REBASE
@@ -181,7 +172,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0027-Installer_Glitch.patch"; #
 applyPatch "$DOS_PATCHES/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch"; #Don't leak device-wide package list to apps when work profile is present (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-1.patch"; #Disable package parser cache (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-2.patch"; #Perform additional boot-time checks on system package updates (GrapheneOS)
-#applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-3.patch"; #Require fs-verity when installing system package updates (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0030-agnss.goog_override.patch"; #Replace agnss.goog with the Broadcom PSDS server (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0031-appops_reset_fix-1.patch"; #Revert "Null safe package name in AppOps writeState" (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0031-appops_reset_fix-2.patch"; #appops: skip ops for invalid null package during state serialization (GrapheneOS)
@@ -189,16 +179,13 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0032-SUPL_Toggle.patch"; #Add a
 applyPatch "$DOS_PATCHES/android_frameworks_base/0033-Ugly_Orbot_Workaround.patch"; #Always add Briar and Tor Browser to Orbot's lockdown allowlist (CalyxOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0034-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0035-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then
 applyPatch "$DOS_PATCHES/android_frameworks_base/0036-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0037-filter-gms.patch"; #Filter select package queries for GMS (CalyxOS)
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0038-no-camera-lpad.patch"; #Do not auto-grant Camera permission to the eUICC LPA UI app (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0039-package_hooks.patch"; #Add hooks for modifying PackageManagerService behavior (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0040-euicc-restrictions.patch"; #Integrate Google's EuiccSupportPixel package (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0041-tile_restrictions.patch"; #SystemUI: Require unlocking to use sensitive QS tiles (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0042-minimal_screenshot_exif.patch"; #Put bare minimum metadata in screenshots (CalyxOS)
-if [ "$DOS_SNET" = true ]; then git am "$DOS_PATCHES/android_frameworks_base/snet-20.patch"; fi;
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0008-No_Crash_GSF.patch"; #Don't crash apps that depend on missing Gservices provider (GrapheneOS)
 hardenLocationConf services/core/java/com/android/server/location/gnss/gps_debug.conf; #Harden the default GPS config
 sed -i 's/DEFAULT_USE_COMPACTION = false;/DEFAULT_USE_COMPACTION = true;/' services/core/java/com/android/server/am/CachedAppOptimizer.java; #Enable app compaction by default (GrapheneOS)
@@ -214,7 +201,7 @@ rm -rf packages/PrintRecommendationService; #Creates popups to install proprieta
 fi;
 
 if enterAndClear "frameworks/ex"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/libs/systemui"; then
@@ -266,12 +253,10 @@ fi;
 
 if enterAndClear "libcore"; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Network_Permission.patch"; #Don't throw SecurityException when INTERNET permission is revoked (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-2.patch";
 fi;
-fi;
 
 if enterAndClear "lineage-sdk"; then
 applyPatch "$DOS_PATCHES/android_lineage-sdk/0001-Private_DNS-Migration.patch"; #Migrate Private DNS preset modes to hostname-mode based (heavily based off of a CalyxOS patch)
@@ -282,11 +267,6 @@ if enterAndClear "packages/apps/Aperture"; then
 git revert --no-edit 09577521a65e1cef0560a84085fca46b1cf53803; #Fix invisible buttons
 fi;
 
-#if enterAndClear "packages/apps/CarrierConfig"; then
-#rm -rf assets/*.xml;
-#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
-#fi;
-
 if enterAndClear "packages/apps/CellBroadcastReceiver"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_CellBroadcastReceiver/0001-presidential_alert_toggle.patch"; #Allow toggling presidential alerts (GrapheneOS)
 fi;
@@ -299,7 +279,6 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0004-No_GMaps.pat
 fi;
 
 if enterAndClear "packages/apps/Dialer"; then
-#applyPatch "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS) TODO: REBASE
 sed -i 's/>true/>false/' java/com/android/incallui/res/values/lineage_config.xml; #XXX: temporary workaround for black screen on incoming calls https://gitlab.com/LineageOS/issues/android/-/issues/4632
 fi;
 
@@ -318,7 +297,7 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Messaging/0001-null-fix.pa
 fi;
 
 if enterAndClear "packages/apps/Nfc"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "packages/apps/Settings"; then
@@ -329,7 +308,7 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.pa
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch"; #Timeout for Wi-Fi (CalyxOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC.patch"; #Add option to always randomize MAC (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-Install_Restrictions.patch"; #UserManager app installation restrictions (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0012-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (heavily based off of a GrapheneOS patch)
@@ -337,7 +316,7 @@ applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0013-Captive_Portal_Togg
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-LTE_Only_Mode-1.patch"; #LTE Only Mode (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-LTE_Only_Mode-2.patch"; #Fix LTE Only mode on World Mode (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0015-SUPL_Toggle.patch"; #Add a toggle for forcibly disabling SUPL (GrapheneOS)
-if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 if [ "$DOS_DEBLOBBER_REMOVE_EUICC_FULL" = false ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch"; fi; #Add a toggle for OpenEUICC enablement (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Settings/0001-disable_apps.patch"; #Add an ability to disable non-system apps from the "App info" screen (GrapheneOS)
 fi;
@@ -402,10 +381,6 @@ if enterAndClear "packages/providers/DownloadProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
 fi;
 
-#if enterAndClear "packages/providers/TelephonyProvider"; then
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/latest_carrier_id/;
-#fi;
-
 if enterAndClear "system/ca-certificates"; then
 rm -rf files; #Remove old certs
 cp -r "$DOS_PATCHES_COMMON/android_system_ca-certificates/files" .; #Copy the new ones into place
@@ -417,8 +392,7 @@ git revert --no-edit 7e2eeae6244ed16c2602480207659ebf0e21674a; #insanity
 git revert --no-edit 942dd2ac9eed11d0ff31fb734de46c2da24b4b9b; #unknown impact
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_core/0002-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
-if [ "$DOS_SNET_EXTRA" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/snet-20.patch"; fi;
+applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "system/extras"; then
@@ -502,7 +476,7 @@ awk -i inplace '!/PRODUCT_PACKAGES/' widevine/device.mk;
 fi;
 
 if enterAndClear "device/google/redbull"; then
-if [ "$DOS_DEFCONFIG_DISABLER" = true ]; then awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; fi; #fix compile after hardenDefconfig
+awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig
 fi;
 
 if enterAndClear "device/google/muskie"; then
@@ -550,23 +524,19 @@ if enterAndClear "kernel/fairphone/sdm632"; then
 sed -i 's|/../../prebuilts/tools-lineage|/../../../prebuilts/tools-lineage|' lib/Makefile; #fixup typo
 fi;
 
-#if enterAndClear "kernel/oneplus/sm8250"; then
-#git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29;
-#fi;
-
 #Make changes to all devices
 cd "$DOS_BUILD_BASE";
 find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -name "gps\.conf*" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "vendor" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi; #TODO RETEST THIS
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
@@ -575,7 +545,7 @@ enableAutoVarInit || true;
 changeDefaultDNS; #Change the default DNS servers
 fixupCarrierConfigs || true; #Remove silly carrier restrictions
 removeUntrustedCerts || true;
-sed -i 's/SSLv23_NO_TLSv1_2/TLSv1_2/' device/*/*/gps*xml* device/*/*/location/gps*xml* device/*/*/gnss/*/config/gps*xml* || true;; #Enforce TLSv1.2 for SUPL on Tensor devices (GrapheneOS)
+sed -i 's/SSLv23_NO_TLSv1_2/TLSv1_2/' device/*/*/gps*xml* device/*/*/location/gps*xml* device/*/*/gnss/*/config/gps*xml* || true; #Enforce TLSv1.2 for SUPL on Tensor devices (GrapheneOS)
 cd "$DOS_BUILD_BASE";
 #rm -rfv device/*/*/overlay/CarrierConfigResCommon device/*/*/rro_overlays/CarrierConfigOverlay device/*/*/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml;
 
diff --git a/Scripts/LineageOS-20.0/Rebrand.sh b/Scripts/LineageOS-20.0/Rebrand.sh
index f55c83a0..c9372a37 100644
--- a/Scripts/LineageOS-20.0/Rebrand.sh
+++ b/Scripts/LineageOS-20.0/Rebrand.sh
@@ -88,8 +88,8 @@ if [ "$DOS_OTA_SERVER_EXTENDED" = true ]; then
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_PRIMARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_PRIMARY"'|' app/src/main/res/xml/network_security_config.xml;
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_SECONDARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_SECONDARY"'|' app/src/main/res/xml/network_security_config.xml;
 else
-	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
-	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
 fi;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' app/src/main/res/values*/strings.xml;
 sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml;
diff --git a/Scripts/LineageOS-21.0/Functions.sh b/Scripts/LineageOS-21.0/Functions.sh
index 93a124dd..bd824f7c 100644
--- a/Scripts/LineageOS-21.0/Functions.sh
+++ b/Scripts/LineageOS-21.0/Functions.sh
@@ -33,7 +33,6 @@ export -f scanWorkspaceForMalware;
 buildDevice() {
 	cd "$DOS_BUILD_BASE";
 	if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then
-		#export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1";
 		breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2;
 	else
 		echo -e "\e[0;31mNo signing keys available for $1\e[0m";
@@ -43,7 +42,6 @@ export -f buildDevice;
 
 buildDeviceDebug() {
 	cd "$DOS_BUILD_BASE";
-	unset OTA_KEY_OVERRIDE_DIR;
 	brunch "lineage_$1-eng";
 }
 export -f buildDeviceDebug;
@@ -84,10 +82,6 @@ patchWorkspaceReal() {
 	#sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
 	sh "$DOS_SCRIPTS_COMMON/Post.sh";
 	source build/envsetup.sh;
-
-	#Deblobbing fixes
-	##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
-	#none yet
 }
 export -f patchWorkspaceReal;
 
diff --git a/Scripts/LineageOS-21.0/Patch.sh b/Scripts/LineageOS-21.0/Patch.sh
index 401ce225..c962c85f 100644
--- a/Scripts/LineageOS-21.0/Patch.sh
+++ b/Scripts/LineageOS-21.0/Patch.sh
@@ -38,7 +38,7 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh";
 #
 #Download some (non-executable) out-of-tree files for use later on
 cd "$DOS_TMP_DIR";
-if [ "$DOS_HOSTS_BLOCKING" = true ]; then $DOS_TOR_WRAPPER wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
+if [ "$DOS_HOSTS_BLOCKING" = true ]; then wget --no-verbose "$DOS_HOSTS_BLOCKING_LIST" -N -O "$DOS_HOSTS_FILE"; fi;
 cd "$DOS_BUILD_BASE";
 #
 #END OF PREPRATION
@@ -57,12 +57,11 @@ cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE
 cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
 
 if enterAndClear "art"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_art/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "bionic"; then
 git revert --no-edit 7126ad39da09905c7096e85a30bf71ebf1016127; #Add ability to build scudo-free 32-bit libc variant.
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then #(GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; #Use Scudo on 32-bit and hardened_malloc on 64-bit (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Runtime_Control-1.patch"; #Add a runtime option to disable hardened_malloc (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Runtime_Control-2.patch"; #Support assigning ID to path of current executable (GrapheneOS)
@@ -70,8 +69,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Runtime_Control-3.patch"; #Suppo
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-1.patch"; #Disable hardened_malloc for Pixel camera provider service (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-2.patch"; #Disable hardened_malloc for surfaceflinger (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_bionic/0001-HM-No_GWP_ASan.patch"; #Never enable GWP-ASan (GrapheneOS)
-fi;
-if [ "$DOS_GRAPHENE_BIONIC" = true ]; then
 applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
@@ -87,7 +84,6 @@ applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-11.patch"
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-14.patch"; #Add guard page(s) between static_tls and stack (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-15.patch"; #Move pthread_internal_t behind guard page (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-16.patch"; #Add secondary stack randomization (GrapheneOS)
-fi;
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Cache.patch"; #Sort and cache hosts file data for fast lookup (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0003-Hosts_Wildcards.patch"; #Support wildcards in cached hosts file (tdm)
 applyPatch "$DOS_PATCHES/android_bionic/0004-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS)
@@ -100,34 +96,31 @@ fi;
 if enterAndClear "build/make"; then
 git revert --no-edit aedf4a33fe4796e100ca1529fb2fcaa042f14f3b; #Re-enable the downgrade check
 applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
+applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
 applyPatch "$DOS_PATCHES/android_build/0004-Selective_APEX.patch"; #Only enable APEX on 6th/7th gen Pixel devices (GrapheneOS)
 sed -i '77i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 fi;
 
 if enterAndClear "build/soong"; then
 applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_available.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_available.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "external/chromium-webview"; then
-if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
-if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
+git lfs pull; #Ensure the objects are available
 fi;
 
 if enterAndClear "external/conscrypt"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
 if enterAndClear "external/hardened_malloc"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
-applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc-modern/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
+applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
 sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
 sed -i -e '76,78d;' Android.bp; #fix compile under A13
 fi;
-fi;
 
 if enterAndClear "frameworks/base"; then 
 git revert --no-edit 32602dc51dc88664133eaa905bee62ed20c40c43; #Reverts "JobScheduler: Respect allow-in-power-save perm" in favor of below patch
@@ -155,12 +148,11 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0005-User_Logout-a1.patch"; #Fi
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0015-WiFi_Timeout.patch"; #Timeout for Wi-Fi (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0015-Bluetooth_Timeout-Fix.patch"; #bugfix: Bluetooth auto turn off ignored connected BLE devices (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_frameworks_base/0017-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-2.patch"; #Disable exec spawning when using debugging options (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-3.patch"; #Add parameter for avoiding full preload with exec (GrapheneOS)
-applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-4.patch"; #Pass through fullPreload to libcore (GwrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-4.patch"; #Pass through fullPreload to libcore (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-5.patch"; #Disable OpenGL preloading for exec spawning (GrapheneOS) XXX: reverted upstream
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-6.patch"; #Disable resource preloading for exec spawning (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-7.patch"; #Disable class preloading for exec spawning (GrapheneOS)
@@ -173,7 +165,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-13.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-14.patch"; #exec spawning: support runtime resource overlays (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-15.patch"; # exec spawning: add workaround for late init of ART userfaultfd GC  (GrapheneOS)
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
-fi;
 applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0022-Ignore_StatementService_ANR.patch"; #Don't report statementservice crashes (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/326692.patch"; #Skip screen on animation when wake and unlock via biometrics (jesec) #TODO: 20REBASE
@@ -183,8 +174,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0026-Crash_Details.patch"; #Add
 applyPatch "$DOS_PATCHES/android_frameworks_base/0028-Remove_Legacy_Package_Query.patch"; #Don't leak device-wide package list to apps when work profile is present (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-1.patch"; #Disable package parser cache (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-2.patch"; #Perform additional boot-time checks on system package updates (GrapheneOS)
-#applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-3.patch"; #Require fs-verity when installing system package updates (GrapheneOS) #XXX: F-Droid doesn't support fs-verity metadata
-#applyPatch "$DOS_PATCHES/android_frameworks_base/0029-Strict_Package_Checks-4.patch"; #Don't allow updating system packages to the same versionCode (GrapheneOS) #XXX: depends on previous patch
 applyPatch "$DOS_PATCHES/android_frameworks_base/0030-agnss.goog_override.patch"; #Replace agnss.goog with the Broadcom PSDS server (heavily based off of a GrapheneOS patch)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0031-appops_reset_fix-1.patch"; #Revert "Null safe package name in AppOps writeState" (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0031-appops_reset_fix-2.patch"; #appops: skip ops for invalid null package during state serialization (GrapheneOS)
@@ -192,10 +181,8 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0031-appops_reset_fix-2.patch";
 applyPatch "$DOS_PATCHES/android_frameworks_base/0033-Ugly_Orbot_Workaround.patch"; #Always add Briar and Tor Browser to Orbot's lockdown allowlist (CalyxOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0034-Allow_Disabling_NTP.patch"; #Dont ping ntp server when nitz time update is toggled off (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0035-System_JobScheduler_Allowance.patch"; #DeviceIdleJobsController: don't ignore whitelisted system apps (GrapheneOS)
-#if [ "$DOS_MICROG_SUPPORT" = true ]; then  #TODO: 21REBASE
-#applyPatch "$DOS_PATCHES/android_frameworks_base/0036-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch)
-#applyPatch "$DOS_PATCHES/android_frameworks_base/0037-filter-gms.patch"; #Filter select package queries for GMS (CalyxOS)
-#fi;
+#applyPatch "$DOS_PATCHES/android_frameworks_base/0036-Unprivileged_microG_Handling.patch"; #Unprivileged microG handling (heavily based off of a CalyxOS patch) #TODO: 21REBASE
+#applyPatch "$DOS_PATCHES/android_frameworks_base/0037-filter-gms.patch"; #Filter select package queries for GMS (CalyxOS) #TODO: 21REBASE
 applyPatch "$DOS_PATCHES/android_frameworks_base/0038-no-camera-lpad.patch"; #Do not auto-grant Camera permission to the eUICC LPA UI app (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0039-package_hooks.patch"; #Add hooks for modifying PackageManagerService behavior (GrapheneOS)  #TODO: 21REBASE
 #applyPatch "$DOS_PATCHES/android_frameworks_base/0040-euicc-restrictions.patch"; #Integrate Google's EuiccSupportPixel package (GrapheneOS)  #TODO: 21REBASE
@@ -211,10 +198,10 @@ sed -i 's/MAX_PASSWORD_LENGTH = 16/MAX_PASSWORD_LENGTH = 64/' core/java/android/
 sed -i 's/DEFAULT_STRONG_AUTH_TIMEOUT_MS = 72 \* 60 \* 60 \* 1000;/DEFAULT_STRONG_AUTH_TIMEOUT_MS = 12 * 60 * 60 * 1000;/' core/java/android/app/admin/DevicePolicyManager.java; #Decrease the strong auth prompt timeout to occur more often
 #rm -rf packages/CompanionDeviceManager; #Used to support Android Wear (which hard depends on GMS)
 rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps
-#fi;
+fi;
 
 if enterAndClear "frameworks/ex"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_ex/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 if enterAndClear "frameworks/libs/systemui"; then
@@ -267,22 +254,15 @@ fi;
 
 if enterAndClear "libcore"; then
 applyPatch "$DOS_PATCHES/android_libcore/0001-Network_Permission.patch"; #Don't throw SecurityException when INTERNET permission is revoked (GrapheneOS)
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then
+applyPatch "$DOS_PATCHES/android_libcore/0002-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-1.patch"; #Add exec-based spawning support (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_libcore/0003-Exec_Based_Spawning-2.patch";
 fi;
-fi;
 
 if enterAndClear "lineage-sdk"; then
 applyPatch "$DOS_PATCHES/android_lineage-sdk/0001-Private_DNS-Migration.patch"; #Migrate Private DNS preset modes to hostname-mode based (heavily based off of a CalyxOS patch)
 fi;
 
-#if enterAndClear "packages/apps/CarrierConfig"; then
-#rm -rf assets/*.xml;
-#cp $DOS_PATCHES_COMMON/android_packages_apps_CarrierConfig/*.xml assets/;
-#fi;
-
 if enterAndClear "packages/apps/CellBroadcastReceiver"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_CellBroadcastReceiver/0001-presidential_alert_toggle.patch"; #Allow toggling presidential alerts (GrapheneOS)
 fi;
@@ -295,7 +275,6 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0004-No_GMaps.pat
 fi;
 
 if enterAndClear "packages/apps/Dialer"; then
-#applyPatch "$DOS_PATCHES/android_packages_apps_Dialer/0001-Not_Private_Banner.patch"; #Add a privacy warning banner to calls (CalyxOS) TODO: REBASE
 sed -i 's/>true/>false/' java/com/android/incallui/res/values/lineage_config.xml; #XXX: temporary workaround for black screen on incoming calls https://gitlab.com/LineageOS/issues/android/-/issues/4632
 fi;
 
@@ -314,18 +293,17 @@ applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Messaging/0001-null-fix.pa
 fi;
 
 if enterAndClear "packages/apps/Nfc"; then
-if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_packages_apps_Nfc/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
 fi;
 
 #if enterAndClear "packages/apps/Settings"; then #TODO: 21REBASE
-#applyPatch "$DOS_PATCHES/android_packages_apps_Settings/316891059-20.patch"; #x-asb_2024-05 Replace getCallingActivity() with getLaunchedFromPackage()
 #git revert --no-edit 41b4ed345a91da1dd46c00ee11a151c2b5ff4f43;
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0004-Private_DNS.patch"; #More 'Private DNS' options (heavily based off of a CalyxOS patch)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0005-Automatic_Reboot.patch"; #Timeout for reboot (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch"; #Timeout for Bluetooth (CalyxOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0007-WiFi_Timeout.patch"; #Timeout for Wi-Fi (CalyxOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0008-ptrace_scope.patch"; #Add native debugging setting (GrapheneOS)
-#if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; fi; #Add exec spawning toggle (GrapheneOS)
+#applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0010-exec_spawning_toggle.patch"; #Add exec spawning toggle (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0011-Random_MAC.patch"; #Add option to always randomize MAC (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0009-Install_Restrictions.patch"; #UserManager app installation restrictions (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0012-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (heavily based off of a GrapheneOS patch)
@@ -333,7 +311,7 @@ fi;
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-LTE_Only_Mode-1.patch"; #LTE Only Mode (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0014-LTE_Only_Mode-2.patch"; #Fix LTE Only mode on World Mode (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0015-SUPL_Toggle.patch"; #Add a toggle for forcibly disabling SUPL (GrapheneOS)
-#if [ "$DOS_MICROG_SUPPORT" = true ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; fi; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
+#applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0016-microG_Toggle.patch"; #Add a toggle for microG enablement (heavily based off of a GrapheneOS patch)
 #if [ "$DOS_DEBLOBBER_REMOVE_EUICC_FULL" = false ]; then applyPatch "$DOS_PATCHES/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch"; fi; #Add a toggle for OpenEUICC enablement (heavily based off of a GrapheneOS patch)
 #applyPatch "$DOS_PATCHES_COMMON/android_packages_apps_Settings/0001-disable_apps.patch"; #Add an ability to disable non-system apps from the "App info" screen (GrapheneOS)
 #fi;
@@ -392,10 +370,6 @@ if enterAndClear "packages/providers/DownloadProvider"; then
 applyPatch "$DOS_PATCHES/android_packages_providers_DownloadProvider/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
 fi;
 
-#if enterAndClear "packages/providers/TelephonyProvider"; then
-#cp $DOS_PATCHES_COMMON/android_packages_providers_TelephonyProvider/carrier_list.* assets/latest_carrier_id/;
-#fi;
-
 if enterAndClear "system/ca-certificates"; then
 rm -rf files; #Remove old certs
 cp -r "$DOS_PATCHES_COMMON/android_system_ca-certificates/files" .; #Copy the new ones into place
@@ -407,7 +381,7 @@ git revert --no-edit 75b64415b9dd9f0415eb9d5fd94caa5de482419f; #insanity
 git revert --no-edit 3cf503f51ee4d1b2f51a517c644a85d02ac5cfcf; #unknown impact
 applyPatch "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysctl changes (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_core/0002-ptrace_scope.patch"; #Add a property for controlling ptrace_scope (GrapheneOS)
-if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
+applyPatch "$DOS_PATCHES/android_system_core/0003-HM-Increase_vm_mmc.patch"; #(GrapheneOS)
 fi;
 
 if enterAndClear "system/extras"; then
@@ -485,13 +459,13 @@ find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4
 find "device" -name "gps\.conf*" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "vendor" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
 find "device" -type d -name "overlay" -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationFWB "{}"';
-#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi;
+#if [ "$DOS_DEBLOBBER_REMOVE_IMS" = "false" ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'volteOverride "{}"'; fi; #TODO RETEST THIS
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableDexPreOpt "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'hardenUserdata "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenDefconfig "{}"';
 find "kernel" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'updateRegDb "{}"';
 find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableAPEX "{}"';
-if [ "$DOS_GRAPHENE_EXEC" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"'; fi;
+find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'disableEnforceRRO "{}"';
 cd "$DOS_BUILD_BASE";
 deblobAudio;
 removeBuildFingerprints;
@@ -500,7 +474,7 @@ enableAutoVarInit || true;
 changeDefaultDNS; #Change the default DNS servers
 fixupCarrierConfigs || true; #Remove silly carrier restrictions
 removeUntrustedCerts || true;
-sed -i 's/SSLv23_NO_TLSv1_2/TLSv1_2/' device/*/*/gps*xml* device/*/*/location/gps*xml* device/*/*/gnss/*/config/gps*xml* || true;; #Enforce TLSv1.2 for SUPL on Tensor devices (GrapheneOS)
+sed -i 's/SSLv23_NO_TLSv1_2/TLSv1_2/' device/*/*/gps*xml* device/*/*/location/gps*xml* device/*/*/gnss/*/config/gps*xml* || true; #Enforce TLSv1.2 for SUPL on Tensor devices (GrapheneOS)
 cd "$DOS_BUILD_BASE";
 #rm -rfv device/*/*/overlay/CarrierConfigResCommon device/*/*/rro_overlays/CarrierConfigOverlay device/*/*/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml;
 
diff --git a/Scripts/LineageOS-21.0/Rebrand.sh b/Scripts/LineageOS-21.0/Rebrand.sh
index 8e240105..74b25b73 100644
--- a/Scripts/LineageOS-21.0/Rebrand.sh
+++ b/Scripts/LineageOS-21.0/Rebrand.sh
@@ -88,8 +88,8 @@ if [ "$DOS_OTA_SERVER_EXTENDED" = true ]; then
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_PRIMARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_PRIMARY"'|' app/src/main/res/xml/network_security_config.xml;
 	sed -i 's|0OTA_SERVER_ONION_DOMAIN_SECONDARY0|'"$DOS_OTA_SERVER_ONION_DOMAIN_SECONDARY"'|' app/src/main/res/xml/network_security_config.xml;
 else
-	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_LEGACY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
-	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_LEGACY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_OTA_SERVER_PRIMARY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
+	sed -i 's|0OTA_SERVER_ONION0|'"$DOS_OTA_SERVER_PRIMARY"'|' app/src/main/java/org/lineageos/updater/misc/Utils.java;
 fi;
 sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' app/src/main/res/values*/strings.xml;
 sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml;
diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh
index 0d4e6ea9..be14c187 100644
--- a/Scripts/Update_Commons.sh
+++ b/Scripts/Update_Commons.sh
@@ -38,11 +38,3 @@ wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineag
 #TODO: CA store
 #https://android.googlesource.com/platform/system/ca-certificates
 #Last: 2024/05/03
-
-#TODO: Carrier List, unused
-#https://android.googlesource.com/platform/packages/providers/TelephonyProvider/
-#Last: 2024/05/03
-
-#TODO: Carrier Configs, unused
-#https://android.googlesource.com/platform/packages/apps/CarrierConfig/
-#Last: 2024/05/03
diff --git a/Scripts/init.sh b/Scripts/init.sh
index 210688bf..e60472ab 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -31,8 +31,6 @@ export DOS_SIGNING_GPG="$DOS_WORKSPACE_ROOT/Signing_Keys/gnupg";
 export CCACHE_COMPRESS=1;
 export CCACHE_COMPRESSLEVEL=1;
 #export DOS_BINARY_PATCHER="";
-export DOS_TOR_WRAPPER="";
-#export DOS_TOR_WRAPPER="torsocks"; #Uncomment to perform select build operations over Tor
 export DOS_MALWARE_SCAN_ENABLED=false; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
 export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full
 export DOS_REFRESH_PATCHES=true; #Set true to refresh branch-specific patches on apply
@@ -47,33 +45,18 @@ export DOS_DEBLOBBER_REMOVE_DPM=true; #Set true to remove all DPM blobs #XXX: Ma
 export DOS_DEBLOBBER_REMOVE_DPP=false; #Set true to remove all Display Post Processing blobs #XXX: Breaks boot on select devices
 export DOS_DEBLOBBER_REMOVE_FACE=false; #Set true to remove all face unlock blobs
 export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs
-export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work
 export DOS_DEBLOBBER_REMOVE_EUICC=true; #Set true to remove all Google eUICC blobs
 export DOS_DEBLOBBER_REMOVE_EUICC_FULL=false; #Set true to remove all hardware eUICC blobs
 export DOS_DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs #XXX: Carriers are phasing out 3G, making IMS mandatory for calls
 export DOS_DEBLOBBER_REMOVE_IPA=false; #Set true to remove all IPA blobs
 export DOS_DEBLOBBER_REMOVE_IR=false; #Set true to remove all IR blobs
 export DOS_DEBLOBBER_REMOVE_RCS=true; #Set true to remove all RCS blobs
-export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=false; #Set true to remove RenderScript blobs
-export DOS_DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation #TODO: Needs testing
 
 #Features
-export DOS_GPS_GLONASS_FORCED=false; #Enables GLONASS on all devices
-export DOS_DEFCONFIG_DISABLER=true; #Enables the disablement of various kernel options
-export DOS_GRAPHENE_BIONIC=true; #Enables the bionic hardening patchset on 16.0+17.1+18.1+19.1+20.0
-export DOS_GRAPHENE_CONSTIFY=true; #Enables 'Constify JNINativeMethod tables' patchset on 16.0+17.1+18.1+19.1+20.0
-export DOS_GRAPHENE_MALLOC=true; #Enables use of GrapheneOS' hardened memory allocator on 64-bit platforms on 15.1+16.0+17.1+18.1+19.1+20.0
-export DOS_GRAPHENE_EXEC=true; #Enables use of GrapheneOS' exec spawning feature on 16.0+17.1+18.1+19.1+20.0
 export DOS_HOSTS_BLOCKING=true; #Set false to prevent inclusion of a HOSTS file
 export DOS_HOSTS_BLOCKING_LIST="https://divested.dev/hosts-wildcards"; #Must be in the format "127.0.0.1 bad.domain.tld"
-export DOS_MICROG_SUPPORT=true; #Opt-in unprivileged microG support on 17.1+18.1+19.1+20.0
-export DOS_SNET=false; #Selectively spoof select build properties
-export DOS_SNET_EXTRA=false; #Globally spoof select bootloader properties
 export DOS_SENSORS_PERM=false; #Set true to provide a per-app sensors permission for 14.1/15.1 #XXX: can break things like camera
-export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 #XXX: THIS WILL **DESTROY** EXISTING INSTALLS!
 export DOS_USE_KSM=false; #Set true to use KSM for increased memory efficiency at the cost of easier side-channel attacks and increased CPU usage #XXX: testing only
-export DOS_WEBVIEW_LFS=true; #Whether to `git lfs pull` in the WebView repository
-#alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/00/316600/2';
 
 #Servers
 export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh
@@ -82,7 +65,7 @@ export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: Any *valid* SUPL server
 
 #Release Processing
 export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing
-export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS
+export DOS_GENERATE_DELTAS=false; #Creates deltas from existing target_files in $DOS_BUILDS
 export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing
 export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true
 export DOS_REMOVE_AFTER_FULL=false; #Removes the entire OUT directory
@@ -101,9 +84,8 @@ export DOS_BRANDING_LINK_NEWS="https://divestos.org/pages/news";
 export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/pages/privacy_policy";
 
 #OTAs
-export DOS_OTA_SERVER_LEGACY="https://divestos.org/updater.php";
+export DOS_OTA_SERVER_PRIMARY="https://divestos.org/updater.php";
 export DOS_OTA_SERVER_EXTENDED=true; #Enable to provide multiple choices as set below
-export DOS_OTA_SERVER_PRIMARY="$DOS_OTA_SERVER_LEGACY";
 export DOS_OTA_SERVER_SECONDARY="https://divestos.eeyo.re/updater.php";
 export DOS_OTA_SERVER_SECONDARY_NAME="Cloudflare";
 export DOS_OTA_SERVER_ONION_PRIMARY="http://divestoseb5nncsydt7zzf5hrfg44md4bxqjs5ifcv4t7gt7u6ohjyyd.onion/updater.php";
@@ -156,11 +138,6 @@ if [ ! -d "$DOS_BUILD_BASE" ]; then
 	return 1;
 fi;
 
-if [ "$DOS_MICROG_SUPPORT" = false ]; then
-	export DOS_SNET=false;
-	export DOS_SNET_EXTRA=false;
-fi;
-
 export DOS_TMP_DIR="/tmp/dos_tmp";
 mkdir -p "$DOS_TMP_DIR";
 export DOS_HOSTS_FILE="$DOS_TMP_DIR/hosts";
@@ -198,7 +175,7 @@ export TZ=:/etc/localtime;
 export LC_ALL=C;
 export LANG=C.UTF-8;
 
-if [[ "$DOS_VERSION" != "LineageOS-20.0" ]]; then export DOS_DEBLOBBER_REMOVE_EUICC_FULL=true; fi;
+if [[ "$DOS_VERSION" != "LineageOS-20.0" ]] && [[ "$DOS_VERSION" != "LineageOS-21.0" ]]; then export DOS_DEBLOBBER_REMOVE_EUICC_FULL=true; fi;
 
 #START OF VERIFICATION
 gpgVerifyGitHead "$DOS_WORKSPACE_ROOT";
diff --git a/TODO b/TODO
deleted file mode 100644
index 8d0bae67..00000000
--- a/TODO
+++ /dev/null
@@ -1,59 +0,0 @@
-Last updated: 2021-12-31
-
-High Priority
-	Website
-		- mod_removeip for GDPR and update Privacy Policy
-
-Medium Priority
-	Build
-		- Add GrapheneOS as a better base for supported devices
-		- Add support for more devices
-	Design
-		- Extirpater UI work
-		- Hypatia UI work
-		- Various other branding (logo, snazzy bootanimation, setupwizard, etc.)
-	Project
-		- Database verification in Hypatia
-	Servers
-		- Dedicated full-time build server
-
-Low Priority
-	Website
-		- Switch to a wiki (?)
-
-Longterm
-	Build
-		- Add automated testing/verification (of edits)
-		- Consider rewriting various utilities in more suitable languages
-		- Switch to AOSP and create clean trees for all of the major devices
-	Linux Patches
-		- Automate pulling of CVE patches from Android and Qualcomm bulletins
-		- Get (even) more CVE patches
-		- Investigate rebasing kernel trees on newer CAF ones
-		- Proper backports of CVE patches
-		- Proper backports of security features
-	Project
-		- Create an Mobile Device Manager solution (?)
-		- Create our own device (free hardware, isolated modem, kernel 5.10+, etc.)
-		- General auditing of everything
-		- Collaborate with various projects
-		- Obtain one of each supported device
-	Website
-		- Create a 'Video Tutorials' page
-
-Contributions to other projects (via labor or funding)
-	Add Tor support: Materialistic, microG, Slide, Transistor, Wikipedia
-	Resurrect: Blockinger, Pandoroid
-	Amexia
-		- More icons
-	Conversations
-		- More colors
-	DNS66
-		- Polish edges
-	Orbot
-		- Better tracking of Tor releases
-
-Funding of new projects
-	- Anti-theft
-	- E-Book reader
-	- IRC client