diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch b/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch index bc37f17a..f783700a 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch @@ -11,10 +11,10 @@ need to be granted by default for all apps to maintain compatibility. 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index e8532ce4edd3..1125787ee374 100644 +index 5b454f2d8939..ab6333e7396f 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -19714,7 +19714,8 @@ public class PackageManagerService extends IPackageManager.Stub +@@ -19729,7 +19729,8 @@ public class PackageManagerService extends IPackageManager.Stub } // If this permission was granted by default, make sure it is. diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index bf5cb19b..49a367d8 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -86,6 +86,7 @@ patchWorkspace() { repopick -it P_asb_2022-10 -e 342119; repopick -it P_tzdata_2022; repopick -it P_asb_2022-11 -e 344200; + repopick -it P_asb_2022-12 -e 345931; 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 d0e5d2fb..f1c8d7cf 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -97,7 +97,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. 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-11-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-11 #XXX +sed -i 's/2022-01-05/2022-12-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-12 #XXX fi; if enterAndClear "build/soong"; then