From f767a8ea87c52a1ceb374f94be83e793078c5300 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 10 Feb 2022 15:36:44 -0500 Subject: [PATCH] Hopefully fix the broken radio on Pixels Thank you Google for all these great proprietary apps. Signed-off-by: Tad --- Scripts/Common/Deblob.sh | 20 +++++++++++--------- Scripts/LineageOS-17.1/Functions.sh | 3 ++- Scripts/LineageOS-17.1/Patch.sh | 1 - Scripts/LineageOS-18.1/Functions.sh | 3 ++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 6030ba5e..588cade0 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -240,15 +240,16 @@ echo "Deblobbing..."; blobs=$blobs"|FMRadioGoogle.apk|FmRadioTrampoline2.apk"; #[Google] - blobs=$blobs"|TetheringEntitlement.apk|CarrierLocation.apk|CarrierWifi.apk|CarrierSettings.apk"; + blobs=$blobs"|TetheringEntitlement.apk|CarrierLocation.apk|CarrierWifi.apk"; + #blobs=$blobs"CarrierSettings.apk|CarrierSetup.apk"; #XXX: breaks radio blobs=$blobs"|HardwareInfo.apk"; blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk"; #Live Captions? #EUICC (Virtual SIM) [Google] - blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk"; #EUICC is useless without GMS - blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img"; - makes=$makes"|android.hardware.telephony.euicc.*"; + #blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk"; #EUICC is useless without GMS #XXX: breaks radio + #blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img"; + #makes=$makes"|android.hardware.telephony.euicc.*"; #Google Camera #blobs=$blobs"|com.google.android.camera.*"; @@ -301,6 +302,7 @@ echo "Deblobbing..."; blobs=$blobs"|imscm.xml|ims.xml|android.hardware.telephony.ims.xml"; blobs=$blobs"|qti_permissions.xml|qti-vzw-ims-internal.xml"; blobs=$blobs"|imssettings.apk|ims.apk"; + #blobs=$blobs"|CarrierServices.apk"; #XXX: must be removed along with euicc due to gms dependency blobs=$blobs"|imscmlibrary.jar|qti-vzw-ims-internal.jar"; blobs=$blobs"|com.qualcomm.qti.imscmservice.*|vendor.qti.ims.*"; #RTP @@ -320,7 +322,7 @@ echo "Deblobbing..."; blobs=$blobs"|lib-imsrcscmclient.so|lib-ims-rcscmjni.so|lib-imsrcscmservice.so|lib-imsrcscm.so|lib-imsrcs.so|lib-imsrcs-v2.so|lib-rcsimssjni.so|lib-rcsjni.so|lib-uceservice.so"; blobs=$blobs"|rcsimssettings.jar|rcsservice.jar"; blobs=$blobs"|rcsimssettings.xml|rcsservice.xml"; - blobs=$blobs"|CarrierServices.apk|RCSBootstraputil.apk|RcsImsBootstraputil.apk|uceShimService.apk"; + blobs=$blobs"|RCSBootstraputil.apk|RcsImsBootstraputil.apk|uceShimService.apk"; #blobs=$blobs"|vendor.qti.ims.rcsconfig.*"; blobs=$blobs"|com.qualcomm.qti.uceservice.*"; makes=$makes"|rcs_service.*"; @@ -511,7 +513,7 @@ echo "Deblobbing..."; #[Verizon] blobs=$blobs"|libmotricity.so|libakuaf.so"; blobs=$blobs"|com.qualcomm.location.vzw_library.jar|com.verizon.hardware.telephony.ehrpd.jar|com.verizon.hardware.telephony.lte.jar|com.verizon.ims.jar|VerizonUnifiedSettings.jar"; - blobs=$blobs"|CarrierSetup.apk|OemDmTrigger.apk|appdirectedsmspermission.apk|AppDirectedSMSService.apk|AppDirectedSMSProxy.apk|VerizonSSOEngine.apk|VZWAPNLib.apk|vzwapnpermission.apk|VZWAPNService.apk|VZWAVS.apk|VzwLcSilent.apk|vzw_msdc_api.apk|VzwOmaTrigger.apk|VerizonAuthDialog.apk|MyVerizonServices.apk|WfcActivation.apk|obdm_stub.apk|QAS_DVC_MSP.*.apk|Showcase.apk|LLKAgent.apk"; + blobs=$blobs"|OemDmTrigger.apk|appdirectedsmspermission.apk|AppDirectedSMSService.apk|AppDirectedSMSProxy.apk|VerizonSSOEngine.apk|VZWAPNLib.apk|vzwapnpermission.apk|VZWAPNService.apk|VZWAVS.apk|VzwLcSilent.apk|vzw_msdc_api.apk|VzwOmaTrigger.apk|VerizonAuthDialog.apk|MyVerizonServices.apk|WfcActivation.apk|obdm_stub.apk|QAS_DVC_MSP.*.apk|Showcase.apk|LLKAgent.apk"; blobs=$blobs"|com.android.vzwomatrigger.xml|vzw_mvs_permissions.xml|obdm_permissions.xml|com.verizon.services.xml|features-verizon.xml|com.qualcomm.location.vzw_library.xml|com.verizon.apn.xml|com.verizon.embms.xml|com.verizon.hardware.telephony.ehrpd.xml|com.verizon.hardware.telephony.lte.xml|com.verizon.ims.xml|com.verizon.provider.xml|com.vzw.vzwapnlib.xml|vzw_sso_permissions.xml|com.vzw.hardware.lte.xml|com.vzw.hardware.ehrpd.xml|verizon_config_params.txt|com.verizon.llkagent.xml|vzw_mvs_sysconfig.xml"; #Voice Recognition @@ -712,9 +714,9 @@ deblobDevice() { sed -i 's|true|false|' overlay/frameworks/base/core/res/res/values/config.xml; fi; fi; - if [ -f overlay/packages/services/Telephony/res/values/config.xml ]; then - awk -i inplace '!/platform_carrier_config_package/' overlay/packages/services/Telephony/res/values/config.xml; - fi; + #if [ -f overlay/packages/services/Telephony/res/values/config.xml ]; then + # awk -i inplace '!/platform_carrier_config_package/' overlay/packages/services/Telephony/res/values/config.xml; #XXX: breaks radio + #fi; if [ -d sepolicy ]; then if [ -z "$replaceTime" ]; then numfiles=(*); numfiles=${#numfiles[@]}; diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index f8868749..498298bf 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -97,9 +97,10 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it ten-firewall; #repopick -i 318916; #Fix kernel build with glibc 2.34 + repopick -it Q_asb_2022-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 675fb886..d8f71644 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -305,7 +305,6 @@ awk -i inplace '!/INODE_COUNT/' BoardConfig-lineage.mk; #mke2fs -1 incompatibili fi; if enterAndClear "device/google/marlin"; then -git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs sed -i 's/BTLogSave \\/BTLogSave/' common/base.mk; #deblobber fixup fi; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index bbb74b38..5a5d860f 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -139,12 +139,13 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 320663; #Trebuchet: Don't hide home screen rotation setting #repopick -i 321297; #fs_mgr: Don't enable clean_scratch_files on non-dynamic devices + repopick -it R_asb_2022-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";