CarrierSettings extract integration changes

Change-Id: Ib6720bbe72612e1412c719e5e1a5164626a83aa0

10 files changed, 382 insertions, 282 deletions

diff --git a/bonito/extract-files.sh b/bonito/extract-files.sh
index 32e5501b..68ed4e86 100755
--- a/bonito/extract-files.sh
+++ b/bonito/extract-files.sh
@@ -73,6 +73,7 @@ function blob_fixup() {
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/bonito/proprietary-files-carriersettings.txt b/bonito/proprietary-files-carriersettings.txt
new file mode 100644
index 00000000..2daf2bd3
--- /dev/null
+++ b/bonito/proprietary-files-carriersettings.txt
@@ -0,0 +1,142 @@
+# All blobs are extracted from Google factory images for each new ASB
+product/etc/CarrierSettings/a1_at.pb
+product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airtel_in.pb
+product/etc/CarrierSettings/apt_tw.pb
+product/etc/CarrierSettings/assurance_us.pb
+product/etc/CarrierSettings/att5g_us.pb
+product/etc/CarrierSettings/att5gsa_us.pb
+product/etc/CarrierSettings/att_us.pb
+product/etc/CarrierSettings/bell_ca.pb
+product/etc/CarrierSettings/bluegrass_us.pb
+product/etc/CarrierSettings/boost_us.pb
+product/etc/CarrierSettings/boosttmo_us.pb
+product/etc/CarrierSettings/bouygues_fr.pb
+product/etc/CarrierSettings/btb_gb.pb
+product/etc/CarrierSettings/btc_gb.pb
+product/etc/CarrierSettings/carrier_list.pb
+product/etc/CarrierSettings/cellcom_us.pb
+product/etc/CarrierSettings/cellcommno_us.pb
+product/etc/CarrierSettings/chatr_ca.pb
+product/etc/CarrierSettings/cht_tw.pb
+product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/congstar_de.pb
+product/etc/CarrierSettings/consumercellulartmo_us.pb
+product/etc/CarrierSettings/coriolis_fr.pb
+product/etc/CarrierSettings/cricket5g_us.pb
+product/etc/CarrierSettings/cricket_us.pb
+product/etc/CarrierSettings/cspire_nl.pb
+product/etc/CarrierSettings/cspire_us.pb
+product/etc/CarrierSettings/default.pb
+product/etc/CarrierSettings/dishatt_us.pb
+product/etc/CarrierSettings/docomo_jp.pb
+product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eplus_de.pb
+product/etc/CarrierSettings/esn_gb.pb
+product/etc/CarrierSettings/fet_tw.pb
+product/etc/CarrierSettings/fi_us.pb
+product/etc/CarrierSettings/fido_ca.pb
+product/etc/CarrierSettings/firstnet_us.pb
+product/etc/CarrierSettings/firstnetpacific2_us.pb
+product/etc/CarrierSettings/firstnetpacific_us.pb
+product/etc/CarrierSettings/fizz_ca.pb
+product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/freedommobile_ca.pb
+product/etc/CarrierSettings/gamma_gb.pb
+product/etc/CarrierSettings/h3_at.pb
+product/etc/CarrierSettings/h3_gb.pb
+product/etc/CarrierSettings/h3_se.pb
+product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/homobile_it.pb
+product/etc/CarrierSettings/idea_in.pb
+product/etc/CarrierSettings/idmobile_gb.pb
+product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno_jp.pb
+product/etc/CarrierSettings/kena_it.pb
+product/etc/CarrierSettings/koodo_ca.pb
+product/etc/CarrierSettings/kpn_nl.pb
+product/etc/CarrierSettings/liberty_pr.pb
+product/etc/CarrierSettings/linemo_jp.pb
+product/etc/CarrierSettings/luckymobile_ca.pb
+product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/movistar_es.pb
+product/etc/CarrierSettings/o2_de.pb
+product/etc/CarrierSettings/o2postpaid_gb.pb
+product/etc/CarrierSettings/o2prepaid_de.pb
+product/etc/CarrierSettings/o2prepaid_gb.pb
+product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/optus_au.pb
+product/etc/CarrierSettings/orange_es.pb
+product/etc/CarrierSettings/orange_fr.pb
+product/etc/CarrierSettings/others.pb
+product/etc/CarrierSettings/pcmobilebell_ca.pb
+product/etc/CarrierSettings/povo_jp.pb
+product/etc/CarrierSettings/rakuten_jp.pb
+product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/rogers5g_ca.pb
+product/etc/CarrierSettings/rogers_ca.pb
+product/etc/CarrierSettings/sfr_fr.pb
+product/etc/CarrierSettings/shaw_ca.pb
+product/etc/CarrierSettings/simple_us.pb
+product/etc/CarrierSettings/singtel_sg.pb
+product/etc/CarrierSettings/smarty_gb.pb
+product/etc/CarrierSettings/softbank_jp.pb
+product/etc/CarrierSettings/solomobile_ca.pb
+product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/sprint_us.pb
+product/etc/CarrierSettings/sprintprepaid_us.pb
+product/etc/CarrierSettings/sprintwholesale_us.pb
+product/etc/CarrierSettings/starhub_sg.pb
+product/etc/CarrierSettings/stc_sa.pb
+product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/swisscom_ch.pb
+product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/tele2_se.pb
+product/etc/CarrierSettings/telekom_de.pb
+product/etc/CarrierSettings/telenor_dk.pb
+product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_se.pb
+product/etc/CarrierSettings/telia_dk.pb
+product/etc/CarrierSettings/telia_no.pb
+product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telstra_au.pb
+product/etc/CarrierSettings/telus_ca.pb
+product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tim_it.pb
+product/etc/CarrierSettings/tmobile_at.pb
+product/etc/CarrierSettings/tmobile_cz.pb
+product/etc/CarrierSettings/tmobile_nl.pb
+product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmomvno_nl.pb
+product/etc/CarrierSettings/tmomvno_us.pb
+product/etc/CarrierSettings/tracfonetmo_us.pb
+product/etc/CarrierSettings/tracfoneverizon_us.pb
+product/etc/CarrierSettings/tstar_tw.pb
+product/etc/CarrierSettings/twm_tw.pb
+product/etc/CarrierSettings/uqmobile_jp.pb
+product/etc/CarrierSettings/uscc_us.pb
+product/etc/CarrierSettings/verizon_us.pb
+product/etc/CarrierSettings/verymobile_it.pb
+product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/virgin_ca.pb
+product/etc/CarrierSettings/virgin_gb.pb
+product/etc/CarrierSettings/virgin_us.pb
+product/etc/CarrierSettings/visible_us.pb
+product/etc/CarrierSettings/visiblev_us.pb
+product/etc/CarrierSettings/vodafone_au.pb
+product/etc/CarrierSettings/vodafone_cz.pb
+product/etc/CarrierSettings/vodafone_de.pb
+product/etc/CarrierSettings/vodafone_es.pb
+product/etc/CarrierSettings/vodafone_gb.pb
+product/etc/CarrierSettings/vodafone_ie.pb
+product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_it.pb
+product/etc/CarrierSettings/vodafone_nl.pb
+product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/windtre_it.pb
+product/etc/CarrierSettings/xfinity_us.pb
diff --git a/bonito/proprietary-files.txt b/bonito/proprietary-files.txt
index 327298d1..ad5da07d 100644
--- a/bonito/proprietary-files.txt
+++ b/bonito/proprietary-files.txt
@@ -99,147 +99,6 @@ product/etc/sysconfig/pixel_experience_2018.xml
 product/etc/sysconfig/pixel_experience_2019_midyear.xml
 
 # Radio
-product/etc/CarrierSettings/a1_at.pb
-product/etc/CarrierSettings/ahamo_jp.pb
-product/etc/CarrierSettings/airtel_in.pb
-product/etc/CarrierSettings/apt_tw.pb
-product/etc/CarrierSettings/assurance_us.pb
-product/etc/CarrierSettings/att5g_us.pb
-product/etc/CarrierSettings/att5gsa_us.pb
-product/etc/CarrierSettings/att_us.pb
-product/etc/CarrierSettings/bell_ca.pb
-product/etc/CarrierSettings/bluegrass_us.pb
-product/etc/CarrierSettings/boost_us.pb
-product/etc/CarrierSettings/boosttmo_us.pb
-product/etc/CarrierSettings/bouygues_fr.pb
-product/etc/CarrierSettings/btb_gb.pb
-product/etc/CarrierSettings/btc_gb.pb
-product/etc/CarrierSettings/carrier_list.pb
-product/etc/CarrierSettings/cellcom_us.pb
-product/etc/CarrierSettings/cellcommno_us.pb
-product/etc/CarrierSettings/chatr_ca.pb
-product/etc/CarrierSettings/cht_tw.pb
-product/etc/CarrierSettings/cityfone_ca.pb
-product/etc/CarrierSettings/claro_pr.pb
-product/etc/CarrierSettings/congstar_de.pb
-product/etc/CarrierSettings/consumercellulartmo_us.pb
-product/etc/CarrierSettings/coriolis_fr.pb
-product/etc/CarrierSettings/cricket5g_us.pb
-product/etc/CarrierSettings/cricket_us.pb
-product/etc/CarrierSettings/cspire_nl.pb
-product/etc/CarrierSettings/cspire_us.pb
-product/etc/CarrierSettings/default.pb
-product/etc/CarrierSettings/dishatt_us.pb
-product/etc/CarrierSettings/docomo_jp.pb
-product/etc/CarrierSettings/docomomvno_jp.pb
-product/etc/CarrierSettings/ee_gb.pb
-product/etc/CarrierSettings/eplus_de.pb
-product/etc/CarrierSettings/esn_gb.pb
-product/etc/CarrierSettings/fet_tw.pb
-product/etc/CarrierSettings/fi_us.pb
-product/etc/CarrierSettings/fido_ca.pb
-product/etc/CarrierSettings/firstnet_us.pb
-product/etc/CarrierSettings/firstnetpacific2_us.pb
-product/etc/CarrierSettings/firstnetpacific_us.pb
-product/etc/CarrierSettings/fizz_ca.pb
-product/etc/CarrierSettings/free_fr.pb
-product/etc/CarrierSettings/freedommobile_ca.pb
-product/etc/CarrierSettings/gamma_gb.pb
-product/etc/CarrierSettings/h3_at.pb
-product/etc/CarrierSettings/h3_gb.pb
-product/etc/CarrierSettings/h3_se.pb
-product/etc/CarrierSettings/halebop_se.pb
-product/etc/CarrierSettings/homobile_it.pb
-product/etc/CarrierSettings/idea_in.pb
-product/etc/CarrierSettings/idmobile_gb.pb
-product/etc/CarrierSettings/kddi_jp.pb
-product/etc/CarrierSettings/kddimvno_jp.pb
-product/etc/CarrierSettings/kena_it.pb
-product/etc/CarrierSettings/koodo_ca.pb
-product/etc/CarrierSettings/kpn_nl.pb
-product/etc/CarrierSettings/liberty_pr.pb
-product/etc/CarrierSettings/linemo_jp.pb
-product/etc/CarrierSettings/luckymobile_ca.pb
-product/etc/CarrierSettings/metropcs_us.pb
-product/etc/CarrierSettings/movistar_es.pb
-product/etc/CarrierSettings/o2_de.pb
-product/etc/CarrierSettings/o2postpaid_gb.pb
-product/etc/CarrierSettings/o2prepaid_de.pb
-product/etc/CarrierSettings/o2prepaid_gb.pb
-product/etc/CarrierSettings/onecall_no.pb
-product/etc/CarrierSettings/optus_au.pb
-product/etc/CarrierSettings/orange_es.pb
-product/etc/CarrierSettings/orange_fr.pb
-product/etc/CarrierSettings/others.pb
-product/etc/CarrierSettings/pcmobilebell_ca.pb
-product/etc/CarrierSettings/povo_jp.pb
-product/etc/CarrierSettings/rakuten_jp.pb
-product/etc/CarrierSettings/redpockettmo_us.pb
-product/etc/CarrierSettings/rjio_in.pb
-product/etc/CarrierSettings/rogers5g_ca.pb
-product/etc/CarrierSettings/rogers_ca.pb
-product/etc/CarrierSettings/sfr_fr.pb
-product/etc/CarrierSettings/shaw_ca.pb
-product/etc/CarrierSettings/simple_us.pb
-product/etc/CarrierSettings/singtel_sg.pb
-product/etc/CarrierSettings/smarty_gb.pb
-product/etc/CarrierSettings/softbank_jp.pb
-product/etc/CarrierSettings/solomobile_ca.pb
-product/etc/CarrierSettings/spectrum_us.pb
-product/etc/CarrierSettings/sprint_us.pb
-product/etc/CarrierSettings/sprintprepaid_us.pb
-product/etc/CarrierSettings/sprintwholesale_us.pb
-product/etc/CarrierSettings/starhub_sg.pb
-product/etc/CarrierSettings/stc_sa.pb
-product/etc/CarrierSettings/sunrise_ch.pb
-product/etc/CarrierSettings/swisscom_ch.pb
-product/etc/CarrierSettings/swisscom_li.pb
-product/etc/CarrierSettings/tbaytel_ca.pb
-product/etc/CarrierSettings/tdc_dk.pb
-product/etc/CarrierSettings/tele2_se.pb
-product/etc/CarrierSettings/telekom_de.pb
-product/etc/CarrierSettings/telenor_dk.pb
-product/etc/CarrierSettings/telenor_no.pb
-product/etc/CarrierSettings/telenor_se.pb
-product/etc/CarrierSettings/telia_dk.pb
-product/etc/CarrierSettings/telia_no.pb
-product/etc/CarrierSettings/telia_se.pb
-product/etc/CarrierSettings/telstra_au.pb
-product/etc/CarrierSettings/telus_ca.pb
-product/etc/CarrierSettings/three_dk.pb
-product/etc/CarrierSettings/tim_it.pb
-product/etc/CarrierSettings/tmobile_at.pb
-product/etc/CarrierSettings/tmobile_cz.pb
-product/etc/CarrierSettings/tmobile_nl.pb
-product/etc/CarrierSettings/tmobile_us.pb
-product/etc/CarrierSettings/tmomvno_nl.pb
-product/etc/CarrierSettings/tmomvno_us.pb
-product/etc/CarrierSettings/tracfonetmo_us.pb
-product/etc/CarrierSettings/tracfoneverizon_us.pb
-product/etc/CarrierSettings/tstar_tw.pb
-product/etc/CarrierSettings/twm_tw.pb
-product/etc/CarrierSettings/uqmobile_jp.pb
-product/etc/CarrierSettings/uscc_us.pb
-product/etc/CarrierSettings/verizon_us.pb
-product/etc/CarrierSettings/verymobile_it.pb
-product/etc/CarrierSettings/videotron_ca.pb
-product/etc/CarrierSettings/virgin_ca.pb
-product/etc/CarrierSettings/virgin_gb.pb
-product/etc/CarrierSettings/virgin_us.pb
-product/etc/CarrierSettings/visible_us.pb
-product/etc/CarrierSettings/visiblev_us.pb
-product/etc/CarrierSettings/vodafone_au.pb
-product/etc/CarrierSettings/vodafone_cz.pb
-product/etc/CarrierSettings/vodafone_de.pb
-product/etc/CarrierSettings/vodafone_es.pb
-product/etc/CarrierSettings/vodafone_gb.pb
-product/etc/CarrierSettings/vodafone_ie.pb
-product/etc/CarrierSettings/vodafone_in.pb
-product/etc/CarrierSettings/vodafone_it.pb
-product/etc/CarrierSettings/vodafone_nl.pb
-product/etc/CarrierSettings/vodafone_tr.pb
-product/etc/CarrierSettings/windtre_it.pb
-product/etc/CarrierSettings/xfinity_us.pb
 product/etc/permissions/com.android.sdm.plugins.connmo.xml
 product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 product/etc/permissions/com.android.sdm.plugins.diagmon.xml
diff --git a/bonito/regen-carriersettings.sh b/bonito/regen-carriersettings.sh
new file mode 100755
index 00000000..df7335bc
--- /dev/null
+++ b/bonito/regen-carriersettings.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Copyright (C) 2019-2023 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+_input_image="${1}"
+_output_file="${2}"
+
+if [ -z "${_input_image}" ]; then
+    echo "No input image supplied"
+    exit 1
+fi
+
+if [ -z "${_output_file}" ]; then
+    echo "No output filename supplied"
+    exit 1
+fi
+
+CARRIER_SKIP_FILES=()
+
+# Initialize the helper
+setup_vendor_deps "${ANDROID_ROOT}"
+
+generate_prop_list_from_image "${_input_image}" "${_output_file}" CARRIER_SKIP_FILES carriersettings
+
+function header() {
+    sed -i "1s/^/${1}\n/" "${_output_file}"
+}
+
+header "# All blobs are extracted from Google factory images for each new ASB"
diff --git a/bonito/setup-makefiles.sh b/bonito/setup-makefiles.sh
index 03c86f4d..9df448c9 100755
--- a/bonito/setup-makefiles.sh
+++ b/bonito/setup-makefiles.sh
@@ -31,6 +31,7 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
 write_headers
 
 write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt" true
 write_makefiles "${MY_DIR}/proprietary-files-vendor.txt" true
 
 # Finish
diff --git a/sargo/extract-files.sh b/sargo/extract-files.sh
index 1784cf0c..5370cb32 100755
--- a/sargo/extract-files.sh
+++ b/sargo/extract-files.sh
@@ -73,6 +73,7 @@ function blob_fixup() {
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/sargo/proprietary-files-carriersettings.txt b/sargo/proprietary-files-carriersettings.txt
new file mode 100644
index 00000000..2daf2bd3
--- /dev/null
+++ b/sargo/proprietary-files-carriersettings.txt
@@ -0,0 +1,142 @@
+# All blobs are extracted from Google factory images for each new ASB
+product/etc/CarrierSettings/a1_at.pb
+product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airtel_in.pb
+product/etc/CarrierSettings/apt_tw.pb
+product/etc/CarrierSettings/assurance_us.pb
+product/etc/CarrierSettings/att5g_us.pb
+product/etc/CarrierSettings/att5gsa_us.pb
+product/etc/CarrierSettings/att_us.pb
+product/etc/CarrierSettings/bell_ca.pb
+product/etc/CarrierSettings/bluegrass_us.pb
+product/etc/CarrierSettings/boost_us.pb
+product/etc/CarrierSettings/boosttmo_us.pb
+product/etc/CarrierSettings/bouygues_fr.pb
+product/etc/CarrierSettings/btb_gb.pb
+product/etc/CarrierSettings/btc_gb.pb
+product/etc/CarrierSettings/carrier_list.pb
+product/etc/CarrierSettings/cellcom_us.pb
+product/etc/CarrierSettings/cellcommno_us.pb
+product/etc/CarrierSettings/chatr_ca.pb
+product/etc/CarrierSettings/cht_tw.pb
+product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/congstar_de.pb
+product/etc/CarrierSettings/consumercellulartmo_us.pb
+product/etc/CarrierSettings/coriolis_fr.pb
+product/etc/CarrierSettings/cricket5g_us.pb
+product/etc/CarrierSettings/cricket_us.pb
+product/etc/CarrierSettings/cspire_nl.pb
+product/etc/CarrierSettings/cspire_us.pb
+product/etc/CarrierSettings/default.pb
+product/etc/CarrierSettings/dishatt_us.pb
+product/etc/CarrierSettings/docomo_jp.pb
+product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eplus_de.pb
+product/etc/CarrierSettings/esn_gb.pb
+product/etc/CarrierSettings/fet_tw.pb
+product/etc/CarrierSettings/fi_us.pb
+product/etc/CarrierSettings/fido_ca.pb
+product/etc/CarrierSettings/firstnet_us.pb
+product/etc/CarrierSettings/firstnetpacific2_us.pb
+product/etc/CarrierSettings/firstnetpacific_us.pb
+product/etc/CarrierSettings/fizz_ca.pb
+product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/freedommobile_ca.pb
+product/etc/CarrierSettings/gamma_gb.pb
+product/etc/CarrierSettings/h3_at.pb
+product/etc/CarrierSettings/h3_gb.pb
+product/etc/CarrierSettings/h3_se.pb
+product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/homobile_it.pb
+product/etc/CarrierSettings/idea_in.pb
+product/etc/CarrierSettings/idmobile_gb.pb
+product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno_jp.pb
+product/etc/CarrierSettings/kena_it.pb
+product/etc/CarrierSettings/koodo_ca.pb
+product/etc/CarrierSettings/kpn_nl.pb
+product/etc/CarrierSettings/liberty_pr.pb
+product/etc/CarrierSettings/linemo_jp.pb
+product/etc/CarrierSettings/luckymobile_ca.pb
+product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/movistar_es.pb
+product/etc/CarrierSettings/o2_de.pb
+product/etc/CarrierSettings/o2postpaid_gb.pb
+product/etc/CarrierSettings/o2prepaid_de.pb
+product/etc/CarrierSettings/o2prepaid_gb.pb
+product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/optus_au.pb
+product/etc/CarrierSettings/orange_es.pb
+product/etc/CarrierSettings/orange_fr.pb
+product/etc/CarrierSettings/others.pb
+product/etc/CarrierSettings/pcmobilebell_ca.pb
+product/etc/CarrierSettings/povo_jp.pb
+product/etc/CarrierSettings/rakuten_jp.pb
+product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/rogers5g_ca.pb
+product/etc/CarrierSettings/rogers_ca.pb
+product/etc/CarrierSettings/sfr_fr.pb
+product/etc/CarrierSettings/shaw_ca.pb
+product/etc/CarrierSettings/simple_us.pb
+product/etc/CarrierSettings/singtel_sg.pb
+product/etc/CarrierSettings/smarty_gb.pb
+product/etc/CarrierSettings/softbank_jp.pb
+product/etc/CarrierSettings/solomobile_ca.pb
+product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/sprint_us.pb
+product/etc/CarrierSettings/sprintprepaid_us.pb
+product/etc/CarrierSettings/sprintwholesale_us.pb
+product/etc/CarrierSettings/starhub_sg.pb
+product/etc/CarrierSettings/stc_sa.pb
+product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/swisscom_ch.pb
+product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/tele2_se.pb
+product/etc/CarrierSettings/telekom_de.pb
+product/etc/CarrierSettings/telenor_dk.pb
+product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_se.pb
+product/etc/CarrierSettings/telia_dk.pb
+product/etc/CarrierSettings/telia_no.pb
+product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telstra_au.pb
+product/etc/CarrierSettings/telus_ca.pb
+product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tim_it.pb
+product/etc/CarrierSettings/tmobile_at.pb
+product/etc/CarrierSettings/tmobile_cz.pb
+product/etc/CarrierSettings/tmobile_nl.pb
+product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmomvno_nl.pb
+product/etc/CarrierSettings/tmomvno_us.pb
+product/etc/CarrierSettings/tracfonetmo_us.pb
+product/etc/CarrierSettings/tracfoneverizon_us.pb
+product/etc/CarrierSettings/tstar_tw.pb
+product/etc/CarrierSettings/twm_tw.pb
+product/etc/CarrierSettings/uqmobile_jp.pb
+product/etc/CarrierSettings/uscc_us.pb
+product/etc/CarrierSettings/verizon_us.pb
+product/etc/CarrierSettings/verymobile_it.pb
+product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/virgin_ca.pb
+product/etc/CarrierSettings/virgin_gb.pb
+product/etc/CarrierSettings/virgin_us.pb
+product/etc/CarrierSettings/visible_us.pb
+product/etc/CarrierSettings/visiblev_us.pb
+product/etc/CarrierSettings/vodafone_au.pb
+product/etc/CarrierSettings/vodafone_cz.pb
+product/etc/CarrierSettings/vodafone_de.pb
+product/etc/CarrierSettings/vodafone_es.pb
+product/etc/CarrierSettings/vodafone_gb.pb
+product/etc/CarrierSettings/vodafone_ie.pb
+product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_it.pb
+product/etc/CarrierSettings/vodafone_nl.pb
+product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/windtre_it.pb
+product/etc/CarrierSettings/xfinity_us.pb
diff --git a/sargo/proprietary-files.txt b/sargo/proprietary-files.txt
index f6cfef42..b4ce4ebe 100644
--- a/sargo/proprietary-files.txt
+++ b/sargo/proprietary-files.txt
@@ -99,147 +99,6 @@ product/etc/sysconfig/pixel_experience_2018.xml
 product/etc/sysconfig/pixel_experience_2019_midyear.xml
 
 # Radio
-product/etc/CarrierSettings/a1_at.pb
-product/etc/CarrierSettings/ahamo_jp.pb
-product/etc/CarrierSettings/airtel_in.pb
-product/etc/CarrierSettings/apt_tw.pb
-product/etc/CarrierSettings/assurance_us.pb
-product/etc/CarrierSettings/att5g_us.pb
-product/etc/CarrierSettings/att5gsa_us.pb
-product/etc/CarrierSettings/att_us.pb
-product/etc/CarrierSettings/bell_ca.pb
-product/etc/CarrierSettings/bluegrass_us.pb
-product/etc/CarrierSettings/boost_us.pb
-product/etc/CarrierSettings/boosttmo_us.pb
-product/etc/CarrierSettings/bouygues_fr.pb
-product/etc/CarrierSettings/btb_gb.pb
-product/etc/CarrierSettings/btc_gb.pb
-product/etc/CarrierSettings/carrier_list.pb
-product/etc/CarrierSettings/cellcom_us.pb
-product/etc/CarrierSettings/cellcommno_us.pb
-product/etc/CarrierSettings/chatr_ca.pb
-product/etc/CarrierSettings/cht_tw.pb
-product/etc/CarrierSettings/cityfone_ca.pb
-product/etc/CarrierSettings/claro_pr.pb
-product/etc/CarrierSettings/congstar_de.pb
-product/etc/CarrierSettings/consumercellulartmo_us.pb
-product/etc/CarrierSettings/coriolis_fr.pb
-product/etc/CarrierSettings/cricket5g_us.pb
-product/etc/CarrierSettings/cricket_us.pb
-product/etc/CarrierSettings/cspire_nl.pb
-product/etc/CarrierSettings/cspire_us.pb
-product/etc/CarrierSettings/default.pb
-product/etc/CarrierSettings/dishatt_us.pb
-product/etc/CarrierSettings/docomo_jp.pb
-product/etc/CarrierSettings/docomomvno_jp.pb
-product/etc/CarrierSettings/ee_gb.pb
-product/etc/CarrierSettings/eplus_de.pb
-product/etc/CarrierSettings/esn_gb.pb
-product/etc/CarrierSettings/fet_tw.pb
-product/etc/CarrierSettings/fi_us.pb
-product/etc/CarrierSettings/fido_ca.pb
-product/etc/CarrierSettings/firstnet_us.pb
-product/etc/CarrierSettings/firstnetpacific2_us.pb
-product/etc/CarrierSettings/firstnetpacific_us.pb
-product/etc/CarrierSettings/fizz_ca.pb
-product/etc/CarrierSettings/free_fr.pb
-product/etc/CarrierSettings/freedommobile_ca.pb
-product/etc/CarrierSettings/gamma_gb.pb
-product/etc/CarrierSettings/h3_at.pb
-product/etc/CarrierSettings/h3_gb.pb
-product/etc/CarrierSettings/h3_se.pb
-product/etc/CarrierSettings/halebop_se.pb
-product/etc/CarrierSettings/homobile_it.pb
-product/etc/CarrierSettings/idea_in.pb
-product/etc/CarrierSettings/idmobile_gb.pb
-product/etc/CarrierSettings/kddi_jp.pb
-product/etc/CarrierSettings/kddimvno_jp.pb
-product/etc/CarrierSettings/kena_it.pb
-product/etc/CarrierSettings/koodo_ca.pb
-product/etc/CarrierSettings/kpn_nl.pb
-product/etc/CarrierSettings/liberty_pr.pb
-product/etc/CarrierSettings/linemo_jp.pb
-product/etc/CarrierSettings/luckymobile_ca.pb
-product/etc/CarrierSettings/metropcs_us.pb
-product/etc/CarrierSettings/movistar_es.pb
-product/etc/CarrierSettings/o2_de.pb
-product/etc/CarrierSettings/o2postpaid_gb.pb
-product/etc/CarrierSettings/o2prepaid_de.pb
-product/etc/CarrierSettings/o2prepaid_gb.pb
-product/etc/CarrierSettings/onecall_no.pb
-product/etc/CarrierSettings/optus_au.pb
-product/etc/CarrierSettings/orange_es.pb
-product/etc/CarrierSettings/orange_fr.pb
-product/etc/CarrierSettings/others.pb
-product/etc/CarrierSettings/pcmobilebell_ca.pb
-product/etc/CarrierSettings/povo_jp.pb
-product/etc/CarrierSettings/rakuten_jp.pb
-product/etc/CarrierSettings/redpockettmo_us.pb
-product/etc/CarrierSettings/rjio_in.pb
-product/etc/CarrierSettings/rogers5g_ca.pb
-product/etc/CarrierSettings/rogers_ca.pb
-product/etc/CarrierSettings/sfr_fr.pb
-product/etc/CarrierSettings/shaw_ca.pb
-product/etc/CarrierSettings/simple_us.pb
-product/etc/CarrierSettings/singtel_sg.pb
-product/etc/CarrierSettings/smarty_gb.pb
-product/etc/CarrierSettings/softbank_jp.pb
-product/etc/CarrierSettings/solomobile_ca.pb
-product/etc/CarrierSettings/spectrum_us.pb
-product/etc/CarrierSettings/sprint_us.pb
-product/etc/CarrierSettings/sprintprepaid_us.pb
-product/etc/CarrierSettings/sprintwholesale_us.pb
-product/etc/CarrierSettings/starhub_sg.pb
-product/etc/CarrierSettings/stc_sa.pb
-product/etc/CarrierSettings/sunrise_ch.pb
-product/etc/CarrierSettings/swisscom_ch.pb
-product/etc/CarrierSettings/swisscom_li.pb
-product/etc/CarrierSettings/tbaytel_ca.pb
-product/etc/CarrierSettings/tdc_dk.pb
-product/etc/CarrierSettings/tele2_se.pb
-product/etc/CarrierSettings/telekom_de.pb
-product/etc/CarrierSettings/telenor_dk.pb
-product/etc/CarrierSettings/telenor_no.pb
-product/etc/CarrierSettings/telenor_se.pb
-product/etc/CarrierSettings/telia_dk.pb
-product/etc/CarrierSettings/telia_no.pb
-product/etc/CarrierSettings/telia_se.pb
-product/etc/CarrierSettings/telstra_au.pb
-product/etc/CarrierSettings/telus_ca.pb
-product/etc/CarrierSettings/three_dk.pb
-product/etc/CarrierSettings/tim_it.pb
-product/etc/CarrierSettings/tmobile_at.pb
-product/etc/CarrierSettings/tmobile_cz.pb
-product/etc/CarrierSettings/tmobile_nl.pb
-product/etc/CarrierSettings/tmobile_us.pb
-product/etc/CarrierSettings/tmomvno_nl.pb
-product/etc/CarrierSettings/tmomvno_us.pb
-product/etc/CarrierSettings/tracfonetmo_us.pb
-product/etc/CarrierSettings/tracfoneverizon_us.pb
-product/etc/CarrierSettings/tstar_tw.pb
-product/etc/CarrierSettings/twm_tw.pb
-product/etc/CarrierSettings/uqmobile_jp.pb
-product/etc/CarrierSettings/uscc_us.pb
-product/etc/CarrierSettings/verizon_us.pb
-product/etc/CarrierSettings/verymobile_it.pb
-product/etc/CarrierSettings/videotron_ca.pb
-product/etc/CarrierSettings/virgin_ca.pb
-product/etc/CarrierSettings/virgin_gb.pb
-product/etc/CarrierSettings/virgin_us.pb
-product/etc/CarrierSettings/visible_us.pb
-product/etc/CarrierSettings/visiblev_us.pb
-product/etc/CarrierSettings/vodafone_au.pb
-product/etc/CarrierSettings/vodafone_cz.pb
-product/etc/CarrierSettings/vodafone_de.pb
-product/etc/CarrierSettings/vodafone_es.pb
-product/etc/CarrierSettings/vodafone_gb.pb
-product/etc/CarrierSettings/vodafone_ie.pb
-product/etc/CarrierSettings/vodafone_in.pb
-product/etc/CarrierSettings/vodafone_it.pb
-product/etc/CarrierSettings/vodafone_nl.pb
-product/etc/CarrierSettings/vodafone_tr.pb
-product/etc/CarrierSettings/windtre_it.pb
-product/etc/CarrierSettings/xfinity_us.pb
 product/etc/permissions/com.android.sdm.plugins.connmo.xml
 product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 product/etc/permissions/com.android.sdm.plugins.diagmon.xml
diff --git a/sargo/regen-carriersettings.sh b/sargo/regen-carriersettings.sh
new file mode 100755
index 00000000..df7335bc
--- /dev/null
+++ b/sargo/regen-carriersettings.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Copyright (C) 2019-2023 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+_input_image="${1}"
+_output_file="${2}"
+
+if [ -z "${_input_image}" ]; then
+    echo "No input image supplied"
+    exit 1
+fi
+
+if [ -z "${_output_file}" ]; then
+    echo "No output filename supplied"
+    exit 1
+fi
+
+CARRIER_SKIP_FILES=()
+
+# Initialize the helper
+setup_vendor_deps "${ANDROID_ROOT}"
+
+generate_prop_list_from_image "${_input_image}" "${_output_file}" CARRIER_SKIP_FILES carriersettings
+
+function header() {
+    sed -i "1s/^/${1}\n/" "${_output_file}"
+}
+
+header "# All blobs are extracted from Google factory images for each new ASB"
diff --git a/sargo/setup-makefiles.sh b/sargo/setup-makefiles.sh
index 3b59aca9..c9c2f43c 100755
--- a/sargo/setup-makefiles.sh
+++ b/sargo/setup-makefiles.sh
@@ -31,6 +31,7 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
 write_headers
 
 write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt" true
 write_makefiles "${MY_DIR}/proprietary-files-vendor.txt" true
 
 # Finish