diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index 81b42b5b..97ca95c0 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -1078,6 +1078,7 @@ + diff --git a/Patches/LineageOS-20.0/android_packages_modules_Permission/0004-Special_Permissions-1.patch b/Patches/LineageOS-20.0/android_packages_modules_Permission/0004-Special_Permissions-1.patch index 7fc8cf12..8b2d5fe9 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Permission/0004-Special_Permissions-1.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Permission/0004-Special_Permissions-1.patch @@ -78,7 +78,7 @@ index 5ddea4605..3eca8235c 100644 public boolean isReviewRequired() { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt -index aed275d8a..2cc012479 100644 +index 436612d58..6a20a6164 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt @@ -108,7 +108,7 @@ suspend fun revokeAppPermissions( @@ -91,7 +91,7 @@ index aed275d8a..2cc012479 100644 } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt -index 2216802f3..7bca04085 100644 +index e7f4874e4..738b5d0fa 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt @@ -597,6 +597,7 @@ object KotlinUtils { @@ -104,7 +104,7 @@ index 2216802f3..7bca04085 100644 // Do not touch permissions fixed by the system, or permissions that cannot be granted @@ -827,6 +828,7 @@ object KotlinUtils { var newFlags = perm.flags - var isGranted = perm.isGrantedIncludingAppOp + var isGranted = perm.isGranted val supportsRuntime = group.packageInfo.targetSdkVersion >= Build.VERSION_CODES.M + || Utils.isSpecialRuntimePermission(perm.name) var shouldKill = false diff --git a/Patches/Linux b/Patches/Linux index afd4f3b1..b48fe4d1 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit afd4f3b1d63cdbf680cf0eb2b45fd279a79348ac +Subproject commit b48fe4d1f9aea4d320c9c2e3c76284a5a46aaffd diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index abe07674..99268ea4 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -68,7 +68,7 @@ patchWorkspaceReal() { source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; - repopick -it S_asb_2024-11; + repopick -it S_asb_2024-12 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 714e2a18..3b9a734d 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -95,7 +95,6 @@ applyPatch "$DOS_PATCHES_COMMON/android_build/0001-verity-openssl3.patch"; #Fix sed -i '75i$(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. awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) -sed -i 's/2024-10-05/2024-11-05/' core/version_defaults.mk; #Bump Security String #S_asb_2024-11 fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 41710cad..5ce889af 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -162,7 +162,8 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; + repopick -it T_asb_2024-12; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";