From 4e09464e86217a0692c3488e67808c5b2a167103 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 15 Jun 2022 17:17:47 -0400 Subject: [PATCH] Pick Signed-off-by: Tad --- .../android_frameworks_base/0013-Network_Permission-1.patch | 4 ++-- .../android_frameworks_base/0013-Network_Permission-2.patch | 4 ++-- .../android_frameworks_base/0013-Sensors_Permission.patch | 4 ++-- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch index c956627f..85687daa 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch @@ -9,10 +9,10 @@ Subject: [PATCH] make INTERNET into a special runtime permission 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index af1a6fa9e3c5..873162098247 100644 +index 0aafab66dabd..c66b55feff34 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -1361,7 +1361,7 @@ +@@ -1362,7 +1362,7 @@ diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch index 483271fa..01339574 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch @@ -26,10 +26,10 @@ index e0c2d2dc6dde..b89c46132b26 100644 android.os.Build.VERSION_CODES.DONUT, 0), new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 8efe5474dfea..69ddf1d37a7f 100644 +index a98b3bf710f3..96ad65d1b04f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -1148,6 +1148,20 @@ +@@ -1149,6 +1149,20 @@ android:description="@string/permdesc_useBiometric" android:protectionLevel="normal" /> diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index ac2a04d6..aeca9bd7 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -81,6 +81,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it pie-firewall; repopick -it P_asb_2022-05; + repopick -it P_asb_2022-06; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index e11b8810..65e20462 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -98,7 +98,7 @@ sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2022-01-05/2022-05-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-05 #XXX +sed -i 's/2022-01-05/2022-06-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-06 #XXX fi; if enterAndClear "build/soong"; then