From 4328ec6c6594f3949113ccd923eecaa36d8f7b1f Mon Sep 17 00:00:00 2001 From: Tavi Date: Mon, 24 Jun 2024 09:47:27 -0400 Subject: [PATCH] 20.0: Switch to CarrierConfig2 from GrapheneOS And provide latest Google CarrierSettings to all devices Tested working to enable VoLTE on additional carriers Signed-off-by: Tavi --- Logs/resetWorkspace-LineageOS-20.0.txt | 21 +++++++++++---------- Manifests/Manifest_LAOS-20.0.xml | 1 + Scripts/LineageOS-20.0/Patch.sh | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Logs/resetWorkspace-LineageOS-20.0.txt b/Logs/resetWorkspace-LineageOS-20.0.txt index f838c6ac..b403bf0b 100644 --- a/Logs/resetWorkspace-LineageOS-20.0.txt +++ b/Logs/resetWorkspace-LineageOS-20.0.txt @@ -1,4 +1,4 @@ -android 2e8a1df0490851afd1f855da6ac28f8a9813a95f +android 607a01a914cbddf0d421402f571c835548581b52 art aeeafbd459298788c7760f35d04e7c0568d192b5 bionic e0aac7df6f58138dae903b5d456c947a3f8092ea bootable/libbootloader 6e3710f107248dfbefbf79aaf81caca73a742cab @@ -6,9 +6,9 @@ bootable/recovery 8904d2a254c5263caded20af8fde209f8b37f22d build/bazel 9898ac01c9525bf91d23a1c2b83fc401603cb6d3 build/bazel_common_rules f6cf03f7d0ba2e7cb05c0109a5cd57aae07dc6e8 build/blueprint ca8f0e8e3571c866d69d34cbd47b3989abe8e8cd -build/make 7264f02eb0944af87d5429d18c84e27f9a63c324 +build/make 26afa6d38a151c8a4acce0e28564d47f7713849d build/pesto d554620e6f7ad178b71ebb8c4269830cbd24ad8c -build/soong 703cc091154b7cdec61ab0d5398c691318224882 +build/soong c80e6e3b82f2c0fded69b44b514d4c4d5519c9b5 cts 5f6e2dedd307f20dcf663ae17ab5db8664092430 dalvik 090cb5952bab050da27003badb2d27e279e62115 developers/build 14c252498e7f03de8c5c6a65fdf1d7393b5ffcd6 @@ -113,8 +113,8 @@ device/qcom/sepolicy 54b7abd8fcca916646ea6f8bc0e5e696ac9f39c7 device/qcom/sepolicy-legacy-um 49b7b27b732acd197ce6bba700812047f988dff7 device/qcom/sepolicy_vndr a20d7fd7cf744cd1fdedb0ae638746f07c079826 device/qcom/sepolicy_vndr-legacy-um ad27d810f0c96353204a7841e57eef0eacbc776a -device/razer/aura 7ac660982b423bf13a1ddb7e191b0e6143359039 -device/razer/cheryl 3e7b239ab116035dc0ac056a59face5c4a7869bd +device/razer/aura de0353d3daa6b8e4f194af4a8f3080a788b1c72a +device/razer/cheryl ff914a03075cfe65ffbb9d4175f048594b0066ae device/sample 5f5aef3bb2ca4e82efb3a8c5a7f18ac54af356b6 device/samsung/crownlte a265301fc8a41dca861f149eea71d3396bb4b735 device/samsung/exynos9810-common 4aaa1075094e13834a1f769dddac51601085d89d @@ -802,7 +802,7 @@ external/zstd e6a035a8df42f375160f2acabe3caa283a0184d7 external/zucchini 11a3a4cd409d6e0f4ccfcfb97cc962eeaeddde00 external/zxing 248d7c742809ce1cbde1c4e6163d347e1feb274b frameworks/av 214685e2de63df75def32de6356a4d2853f5d5b7 -frameworks/base 8221cad4a2fa5801fac83dc1f2c1ed4aa93e5994 +frameworks/base db93faff341e18661990091a066fbe076eb9a8da frameworks/compile/libbcc 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5 frameworks/compile/mclinker 18374a53dc8e00ec3667b4e1a257c9b4e41f007f frameworks/compile/slang 1738348ca3d011f3f340883bd48e03a8e6aeb143 @@ -1057,11 +1057,12 @@ packages/apps/Car/SystemUI 4e71dea235d50f12f5e1e55e1eb1ac853142de3d packages/apps/Car/SystemUpdater 8745155ed32e36245318178b02b3f24b22edb744 packages/apps/Car/systemlibs f6565522ae39ca9aa2ce8490dfc395f3bf04cc6d packages/apps/CarrierConfig 6e3308a1bdcf61444ab2bb4ea886be705099da99 +packages/apps/CarrierConfig2 e710a67ed64620fc11f62520cceef4bba64dc2a6 packages/apps/CellBroadcastReceiver 3d7340eeac82125cd9091fc368a031e98f4db7fd packages/apps/CertInstaller 98a80cd7f6f9ad8b46acb5c4798fd2d9253d37c4 packages/apps/Contacts 643d0cb2481a46bfba3c2c0d778024750d7916ae packages/apps/DeskClock d6af44dabe246b2c4357b53d5ede8beec785ba05 -packages/apps/Dialer 0679b110e698af962f2c08e39b3de2c6b7f56f03 +packages/apps/Dialer 712509ed6c9cad150536e679d11ff93e1e6c9d88 packages/apps/DocumentsUI 0458482621fcdca3ee3938b3813f8d17421d62e0 packages/apps/ElmyraService cb1a517757b174a3c472c7eb6392769a10cdbc8b packages/apps/EmergencyInfo e8fe444bd8f8d9b807ed9da969d4147896af6142 @@ -1138,11 +1139,11 @@ packages/modules/RuntimeI18n a529a236d02913ef712cd497a06d575c128e5079 packages/modules/SEPolicy ff064aedc19c5d989724fde8669b8ac998ad80bc packages/modules/Scheduling 6226c065a1a488a08a9cca91dfe481d829608585 packages/modules/SdkExtensions 56e52574c78c4b2480bce3f1a9358c05c149584a -packages/modules/StatsD f4cb39c6490f8a1ac36c126f387e301926eac4f4 +packages/modules/StatsD 1f51182724e3997cb2f2585cf49b47b4cf9cefd3 packages/modules/TestModule 3523a2f0f9b12d4e60374af63aae14f75a2b4c10 packages/modules/Uwb 2a34b6a3e8f6e3cd51bd771907a3ee6eff702a8b packages/modules/Virtualization 48e19513a8735ad26eb2f899a8a97d5764596b9f -packages/modules/Wifi e6037c2d841811524fbcfa53a807c01f5ffb1d1b +packages/modules/Wifi 37ef3e4df3eb285bb2005b303efdce6decfb3877 packages/modules/adb d1e9657fcc4c95d2d97dd5c7ee20c95b223601dd packages/modules/common b13938ae21c0e2eee14b83743a42ecea229a6c26 packages/modules/vndk 2e2799dd657d16d4456be0674c21784be9114141 @@ -1256,7 +1257,7 @@ system/iorap 1b1dcfdeb3db1e3ee52db03caf6c89b5fdee1429 system/keymaster febe227b9fab219cf5118211c2bf6092cd137e0e system/libartpalette 74c42c2b04a7167d190d957e8f44a6ad70f472a2 system/libbase 8436e04cfaa6c21be86b37e9599184d77c67faef -system/libfmq bac6dd847dc052c74ee90671e5f86b2335c281c5 +system/libfmq 87febc318fe8132a9d9feb01c7197ae07777a5c8 system/libhidl e4f4132ed6926d07d1945495deb732a79950c50a system/libhwbinder bfbbb04c096deccf43ad1c52e80c399a7be985ed system/libprocinfo 25a50956ed0afd7abde33cbb99d7dd56ee61511d diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml index f20bb726..736bf76a 100644 --- a/Manifests/Manifest_LAOS-20.0.xml +++ b/Manifests/Manifest_LAOS-20.0.xml @@ -50,6 +50,7 @@ + diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index ed78d159..ffa93c96 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -263,6 +263,12 @@ if enterAndClear "packages/apps/Aperture"; then git revert --no-edit 09577521a65e1cef0560a84085fca46b1cf53803; #Fix invisible buttons fi; +if enterAndClear "packages/apps/CarrierConfig2"; then +sed -i -e '31,35d;' AndroidManifest.xml; #Fixups +rm src/app/grapheneos/carrierconfig2/TestActivity.java src/app/grapheneos/carrierconfig2/loader/CmpTest.java; +if [ -d "$DOS_BUILD_BASE"/vendor/divested-carriersettings ]; then sed -i 's|etc/CarrierSettings|etc/CarrierSettings2|' src/app/grapheneos/carrierconfig2/loader/CSettingsDir.java; fi; #Alter the search path +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; @@ -377,6 +383,11 @@ 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/services/Telephony"; then +if [ -d "$DOS_BUILD_BASE"/vendor/divested-carriersettings ]; then sed -i 's|com.android.carrierconfig|app.grapheneos.carrierconfig2|' res/values/config.xml; fi; #Alter the provider +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 @@ -444,6 +455,13 @@ sed -i 's/OpenCamera/Aperture/' packages.mk; #Use the LineageOS camera app awk -i inplace '!/speed-profile/' build/target/product/lowram.mk; #breaks compile on some dexpreopt devices sed -i 's/wifi,cell/internet/' overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml; #Use the modern quick tile sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divestos.mk; +if [ -d "$DOS_BUILD_BASE"/vendor/divested-carriersettings ]; then +echo "Including CarrierConfig2 & CarrierSettings2"; +echo "ifneq ($(BOARD_WITHOUT_RADIO),true)" >> divestos.mk; +echo "PRODUCT_PACKAGES += CarrierConfig2" >> divestos.mk; +echo "include vendor/divested-carriersettings/CarrierSettings2.mk" >> divestos.mk; +echo "endif" >> divestos.mk; +fi fi; # #END OF ROM CHANGES