From d261ab11072d4dffc368a6ff9a84458948bce077 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 17 Mar 2023 19:27:37 -0400 Subject: [PATCH] Updates Signed-off-by: Tad --- Manifests/Manifest_LAOS-18.1.xml | 1 + Manifests/Manifest_LAOS-19.1.xml | 1 + Manifests/Manifest_LAOS-20.0.xml | 1 + Scripts/LineageOS-18.1/Functions.sh | 1 + Scripts/LineageOS-18.1/Patch.sh | 4 ++++ Scripts/LineageOS-19.1/Functions.sh | 1 + Scripts/LineageOS-19.1/Patch.sh | 4 ++++ 7 files changed, 13 insertions(+) diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml index 96605bf9..c3fd27cd 100644 --- a/Manifests/Manifest_LAOS-18.1.xml +++ b/Manifests/Manifest_LAOS-18.1.xml @@ -68,6 +68,7 @@ + diff --git a/Manifests/Manifest_LAOS-19.1.xml b/Manifests/Manifest_LAOS-19.1.xml index 696c8bd1..3d288888 100644 --- a/Manifests/Manifest_LAOS-19.1.xml +++ b/Manifests/Manifest_LAOS-19.1.xml @@ -42,6 +42,7 @@ + diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml index 3216d688..41a4edc3 100644 --- a/Manifests/Manifest_LAOS-20.0.xml +++ b/Manifests/Manifest_LAOS-20.0.xml @@ -41,6 +41,7 @@ + diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 2c5dc518..8da50386 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -117,6 +117,7 @@ patchWorkspace() { #repopick -it eleven-firewall; #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default + repopick -it R_asb_2023-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index d40085c4..0dcb0e05 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -122,6 +122,10 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; +if enterAndClear "external/zlib"; then +git fetch https://github.com/LineageOS/android_external_zlib refs/changes/09/351409/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-03 +fi; + if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 341c42f3..ae744746 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -82,6 +82,7 @@ patchWorkspace() { #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; repopick -if 330099; #Updater: Add prop for allowing major updates + repopick -it S_asb_2023-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index cc940530..dd55699c 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -125,6 +125,10 @@ sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others fi; +if enterAndClear "external/zlib"; then +git fetch https://github.com/LineageOS/android_external_zlib refs/changes/79/351379/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-03 +fi; + if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/344888-backport.patch"; #fixup! fw/b: Add support for allowing/disallowing apps on cellular, vpn and wifi networks (CalyxOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)