From 991e4c0642fd9a42ca1966e423e519feb5134b02 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 17 May 2022 18:42:03 -0400 Subject: [PATCH] Revert "Revert b5224f0" I've triple checked that calls/data work fine without these blobs and also have another report from walleye as the same. I have no idea what is happening to those who have SIM issues. This reverts commit dc392b17b6d5661246c98277809475a74565ad3a. --- Scripts/Common/Deblob.sh | 10 +++++----- Scripts/init.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 2e09cf7a..c9893284 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -263,13 +263,13 @@ echo "Deblobbing..."; #[Google] blobs=$blobs"|TetheringEntitlement.apk|CarrierLocation.apk|CarrierWifi.apk"; - #blobs=$blobs"|CarrierSettings.apk|CarrierSetup.apk"; + blobs=$blobs"|CarrierSettings.apk|CarrierSetup.apk"; blobs=$blobs"|HardwareInfo.apk"; blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk"; overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService"; overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent"; - #overlay=$overlay"|platform_carrier_config_package"; + overlay=$overlay"|platform_carrier_config_package"; #EUICC (Virtual SIM) [Google] if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then @@ -769,9 +769,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; + fi; if [ -d sepolicy ]; then if [ -z "$replaceTime" ]; then numfiles=(*); numfiles=${#numfiles[@]}; diff --git a/Scripts/init.sh b/Scripts/init.sh index f906830e..a3a81400 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -48,7 +48,7 @@ export DOS_DEBLOBBER_REMOVE_DPM=true; #Set true to remove all DPM blobs 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_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=false; #Set true to remove all EUICC blobs +export DOS_DEBLOBBER_REMOVE_EUICC=true; #Set true to remove all 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