Remove the Google carrier blobs

These were previously removed, and added back after a false report of breakage.

Data and VoLTE tested working on taimen

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-05-02 23:38:55 -04:00
parent e38aff581e
commit b5224f0c79
4 changed files with 30 additions and 15 deletions

View File

@ -1,4 +1,4 @@
From ddf071766e4388217b14b9572eccbd3507cfa80d Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@lineageos.org> From: Jesse Chan <jc@lineageos.org>
Date: Sat, 15 Aug 2020 21:38:06 +0800 Date: Sat, 15 Aug 2020 21:38:06 +0800
Subject: [PATCH] Skip screen on animation when wake and unlock via biometrics Subject: [PATCH] Skip screen on animation when wake and unlock via biometrics
@ -14,10 +14,10 @@ Change-Id: I5f98259eb992b2f43872f957fcb0092412fe558c
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index a515bf54436c..9ff524f82866 100644 index 371887ba60de..a0630e4831e1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -3920,7 +3920,8 @@ public void updateScrimController() { @@ -3924,7 +3924,8 @@ public class StatusBar extends SystemUI implements
boolean launchingAffordanceWithPreview = boolean launchingAffordanceWithPreview =
mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); mNotificationPanelViewController.isLaunchingAffordanceWithPreview();

View File

@ -76,10 +76,10 @@ index a3ee437..c4532c5 100644
The array should be sorted in the same order as the The array should be sorted in the same order as the
touchscreen gestures advertised by the device's LineageHW impl. --> touchscreen gestures advertised by the device's LineageHW impl. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9fe4181..4be6a14 100644 index 0915dfd..a2d4d45 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -531,28 +531,6 @@ @@ -532,28 +532,6 @@
<b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/> <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
<b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string> <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>

View File

@ -254,16 +254,20 @@ echo "Deblobbing...";
#[Google] #[Google]
blobs=$blobs"|TetheringEntitlement.apk|CarrierLocation.apk|CarrierWifi.apk"; blobs=$blobs"|TetheringEntitlement.apk|CarrierLocation.apk|CarrierWifi.apk";
#blobs=$blobs"CarrierSettings.apk|CarrierSetup.apk"; #XXX: breaks radio blobs=$blobs"|CarrierSettings.apk|CarrierSetup.apk";
blobs=$blobs"|HardwareInfo.apk"; blobs=$blobs"|HardwareInfo.apk";
blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|SCONE.apk"; #???
blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.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_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService";
overlay=$overlay"|platform_carrier_config_package";
#EUICC (Virtual SIM) [Google] #EUICC (Virtual SIM) [Google]
#blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk"; #EUICC is useless without GMS #XXX: breaks radio if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then
#blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img"; blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk|EuiccSupportPixelPermissions.apk"; #EUICC is useless without GMS
#makes=$makes"|android.hardware.telephony.euicc.*"; blobs=$blobs"|esim0.img|esim-v1.img|esim-full-v0.img|esim-a1.img|esim-a2.img";
makes=$makes"|android.hardware.telephony.euicc.*|GoogleParts";
overlay=$overlay"|config_telephonyEuiccDeviceCapabilities";
fi;
#Google Camera #Google Camera
#blobs=$blobs"|com.google.android.camera.*"; #blobs=$blobs"|com.google.android.camera.*";
@ -321,7 +325,6 @@ echo "Deblobbing...";
blobs=$blobs"|imscm.xml|ims.xml|android.hardware.telephony.ims.xml"; blobs=$blobs"|imscm.xml|ims.xml|android.hardware.telephony.ims.xml";
blobs=$blobs"|qti_permissions.xml|qti-vzw-ims-internal.xml"; blobs=$blobs"|qti_permissions.xml|qti-vzw-ims-internal.xml";
blobs=$blobs"|imssettings.apk|ims.apk"; 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"|imscmlibrary.jar|qti-vzw-ims-internal.jar";
blobs=$blobs"|com.qualcomm.qti.imscmservice.*|vendor.qti.ims.*"; blobs=$blobs"|com.qualcomm.qti.imscmservice.*|vendor.qti.ims.*";
#RTP #RTP
@ -335,6 +338,9 @@ echo "Deblobbing...";
ipcSec=$ipcSec"|32:4294967295:1001"; ipcSec=$ipcSec"|32:4294967295:1001";
manifests=$manifests"|qti.ims|radio.ims"; manifests=$manifests"|qti.ims|radio.ims";
fi; fi;
if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then
blobs=$blobs"|CarrierServices.apk"; #XXX: must be removed along with euicc
fi;
if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_RCS" = true ]; then if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ] || [ "$DOS_DEBLOBBER_REMOVE_RCS" = true ]; then
#RCS (Proprietary messaging protocol) #RCS (Proprietary messaging protocol)
#https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/rcs-service/ [useless] #https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/rcs-service/ [useless]
@ -346,7 +352,7 @@ echo "Deblobbing...";
#blobs=$blobs"|vendor.qti.ims.rcsconfig.*"; #blobs=$blobs"|vendor.qti.ims.rcsconfig.*";
blobs=$blobs"|com.qualcomm.qti.uceservice.*"; blobs=$blobs"|com.qualcomm.qti.uceservice.*";
manifests=$manifests"|uceservice"; manifests=$manifests"|uceservice";
makes=$makes"|rcs_service.*"; makes=$makes"|rcs_service.*|RcsService|PresencePolling";
ipcSec=$ipcSec"|18:4294967295:1001:3004"; ipcSec=$ipcSec"|18:4294967295:1001:3004";
fi; fi;
@ -428,6 +434,14 @@ echo "Deblobbing...";
#blobs=$blobs"|qmi_motext_hook|libmdmcutback.so|libqmimotext.so|libmotext_inf.so"; #necessary for radio #blobs=$blobs"|qmi_motext_hook|libmdmcutback.so|libqmimotext.so|libmotext_inf.so"; #necessary for radio
makes=$makes"|com.motorola.cameraone.xml"; makes=$makes"|com.motorola.cameraone.xml";
#OEMLock (disables OEM unlock toggle) [Google?]
#XXX: cannot be removed because the AOSP no-op service just uses the PDB
#blobs=$blobs"|oemlock-bridge|oemlock-bridge-client|oemlock_provision";
#blobs=$blobs"|android.hardware.oemlock.*";
#blobs=$blobs"|liboemlock.so|liboemlock.*.so|liboemlock-provision.so";
#makes=$makes"|android.hardware.oemlock.*";
#manifests=$manifests"|OemLock";
#OMA-DM/SyncML #See: https://www.blackhat.com/docs/us-14/materials/us-14-Solnik-Cellular-Exploitation-On-A-Global-Scale-The-Rise-And-Fall-Of-The-Control-Protocol.pdf #OMA-DM/SyncML #See: https://www.blackhat.com/docs/us-14/materials/us-14-Solnik-Cellular-Exploitation-On-A-Global-Scale-The-Rise-And-Fall-Of-The-Control-Protocol.pdf
blobs=$blobs"|SyncMLSvc.apk|libsyncml_core.so|libsyncml_port.so"; #SyncML blobs=$blobs"|SyncMLSvc.apk|libsyncml_core.so|libsyncml_port.so"; #SyncML
blobs=$blobs"|libvdmengine.so|libvdmfumo.so"; #RedBend blobs=$blobs"|libvdmengine.so|libvdmfumo.so"; #RedBend
@ -551,7 +565,7 @@ echo "Deblobbing...";
#blobs=$blobs"|aonvr1.bin|aonvr2.bin"; #XXX: required by adspd, likely for more than VR #blobs=$blobs"|aonvr1.bin|aonvr2.bin"; #XXX: required by adspd, likely for more than VR
blobs=$blobs"|vendor.qti.voiceprint.*"; blobs=$blobs"|vendor.qti.voiceprint.*";
blobs=$blobs"|com.android.hotwordenrollment.*"; blobs=$blobs"|com.android.hotwordenrollment.*";
#makes=$makes"|android.hardware.soundtrigger.*|libsoundtriggerservice"; #makes=$makes"|android.hardware.soundtrigger.*|libsoundtriggerservice|sound_trigger.*";
#makes=$makes"|sound_trigger_mixer_paths.xml|sound_trigger_platform_info.xml"; #makes=$makes"|sound_trigger_mixer_paths.xml|sound_trigger_platform_info.xml";
#Wi-Fi [Qualcomm] #Wi-Fi [Qualcomm]
@ -744,9 +758,9 @@ deblobDevice() {
sed -i 's|<bool name="config_carrier_wfc_ims_available">true</bool>|<bool name="config_carrier_wfc_ims_available">false</bool>|' overlay*/frameworks/base/core/res/res/values/config.xml; sed -i 's|<bool name="config_carrier_wfc_ims_available">true</bool>|<bool name="config_carrier_wfc_ims_available">false</bool>|' overlay*/frameworks/base/core/res/res/values/config.xml;
fi; fi;
fi; fi;
#if [ -f overlay/packages/services/Telephony/res/values/config.xml ]; then 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 awk -i inplace '!/platform_carrier_config_package/' overlay*/packages/services/Telephony/res/values/config.xml;
#fi; fi;
if [ -d sepolicy ]; then if [ -d sepolicy ]; then
if [ -z "$replaceTime" ]; then if [ -z "$replaceTime" ]; then
numfiles=(*); numfiles=${#numfiles[@]}; numfiles=(*); numfiles=${#numfiles[@]};

View File

@ -48,6 +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_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_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_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 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_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_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_IR=false; #Set true to remove all IR blobs