diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch index 47b9b463..2815be8b 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Network_Permission-1.patch @@ -23,7 +23,7 @@ index 030310406949..7c4a046fda7b 100644 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java -index 22d3fd41ea64..60dc0a027725 100644 +index e46aa980468c..2dc4f5b39253 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch index b44e8ec8..246e1bbd 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0013-Special_Permissions-2.patch @@ -1,4 +1,4 @@ -From 7408144e1b476918ada6dfaedcc3c243dbb22d7b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 31 May 2022 04:18:35 -0400 Subject: [PATCH] extend special runtime permission implementation @@ -8,10 +8,10 @@ Subject: [PATCH] extend special runtime permission implementation 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java -index c0567a446e48..96e2760d9e87 100644 +index 41b43e3c38bd..8ef30f2d5be2 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java -@@ -1881,7 +1881,7 @@ public void onInstallPermissionUpdatedNotifyListener(int uid) { +@@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { // permission as requiring a review as this is the initial state. final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId); final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid); @@ -20,7 +20,7 @@ index c0567a446e48..96e2760d9e87 100644 ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT : 0; -@@ -2727,7 +2727,7 @@ && shouldGrantPermissionByProtectionFlags(pkg, ps, permission, +@@ -2725,7 +2725,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT); } @@ -29,7 +29,7 @@ index c0567a446e48..96e2760d9e87 100644 uidState.updatePermissionFlags(permission, PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, -@@ -2853,7 +2853,7 @@ && shouldGrantPermissionByProtectionFlags(pkg, ps, permission, +@@ -2851,7 +2851,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { // continue; // } @@ -38,7 +38,7 @@ index c0567a446e48..96e2760d9e87 100644 if (DEBUG_PERMISSIONS) { Log.i(TAG, "Denying runtime-only permission " + bp.getName() + " for package " + friendlyName); -@@ -2932,7 +2932,7 @@ && shouldGrantPermissionByProtectionFlags(pkg, ps, permission, +@@ -2930,7 +2930,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { boolean restrictionApplied = (origState.getPermissionFlags( bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; @@ -47,7 +47,7 @@ index c0567a446e48..96e2760d9e87 100644 // If hard restricted we don't allow holding it if (permissionPolicyInitialized && hardRestricted) { if (!restrictionExempt) { -@@ -3020,7 +3020,7 @@ && shouldGrantPermissionByProtectionFlags(pkg, ps, permission, +@@ -3015,7 +3015,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { if (restrictionApplied) { flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION; // Dropping restriction on a legacy app implies a review diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch b/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch index cccf66bc..8a126873 100644 --- a/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch +++ b/Patches/LineageOS-19.1/android_frameworks_base/0022-Ignore_StatementService_ANR.patch @@ -1,7 +1,7 @@ -From 22d32cb61b289512a0c8b4561d9ea20fe180358d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 20 Oct 2021 19:40:42 -0400 -Subject: [PATCH] [temporary] don't report statementservice crashes +Subject: [PATCH] don't report statementservice crashes There's a known issue in AOSP 12 caused by it creating overly large intents for the work manager. It's not caused by anything done by end @@ -12,10 +12,10 @@ they get a message each time it tries again. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index fb7abb632c15..5965635c7371 100644 +index 7305ccc93e93..5c09243b61e6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3603,7 +3603,7 @@ +@@ -3597,7 +3597,7 @@ diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index a6f7b7ef..067d2005 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -918,9 +918,9 @@ hardenDefconfig() { #Disabled: MSM_SMP2P_TEST, MAGIC_SYSRQ (breaks compile), KALLSYMS (breaks boot on select devices), IKCONFIG (breaks recovery), MSM_DLOAD_MODE (breaks compile), PROC_PAGE_MONITOR (breaks memory stats), SCHED_DEBUG (breaks compile), INET_DIAG declare -a optionsNo=("ACPI_APEI_EINJ" "ACPI_CUSTOM_METHOD" "ACPI_TABLE_UPGRADE" "BINFMT_AOUT" "BINFMT_MISC" "BLK_DEV_FD" "BT_HS" "CHECKPOINT_RESTORE" "COMPAT_BRK" "COMPAT_VDSO" "CP_ACCESS64" "DEBUG_KMEMLEAK" "DEVKMEM" "DEVMEM" "DEVPORT" "EARJACK_DEBUGGER" "GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "FB_VIRTUAL" "HARDENED_USERCOPY_FALLBACK" "HARDENED_USERCOPY_PAGESPAN" "HIBERNATION" "HWPOISON_INJECT" "IA32_EMULATION" "IOMMU_NON_SECURE" "INPUT_EVBUG" "IO_URING" "IP_DCCP" "IP_SCTP" "KEXEC" "KEXEC_FILE" "KSM" "LDISC_AUTOLOAD" "LEGACY_PTYS" "LIVEPATCH" "MEM_SOFT_DIRTY" "MMIOTRACE" "MMIOTRACE_TEST" "MODIFY_LDT_SYSCALL" "MSM_BUSPM_DEV" "NEEDS_SYSCALL_FOR_CMPXCHG" "NOTIFIER_ERROR_INJECTION" "OABI_COMPAT" "PAGE_OWNER" "PROC_KCORE" "PROC_VMCORE" "RDS" "RDS_TCP" "SECURITY_SELINUX_DISABLE" "SECURITY_WRITABLE_HOOKS" "SLAB_MERGE_DEFAULT" "STACKLEAK_METRICS" "STACKLEAK_RUNTIME_DISABLE" "TIMER_STATS" "TSC" "TSPP2" "UKSM" "UPROBES" "USELIB" "USERFAULTFD" "VIDEO_VIVID" "WLAN_FEATURE_MEMDUMP" "X86_IOPL_IOPERM" "X86_PTDUMP" "X86_VSYSCALL_EMULATION" "ZSMALLOC_STAT"); #optionsNo+=("CFI_PERMISSIVE"); - optionsNo+=("SLUB_DEBUG"); + optionsNo+=("SLUB_DEBUG" "SLUB_DEBUG_ON"); if [[ $kernelVersion == "4."* ]] || [[ $kernelVersion == "5."* ]]; then - optionsNo+=("DEBUG_FS"); + #optionsNo+=("DEBUG_FS"); optionsNo+=("FTRACE" "KPROBE_EVENTS" "UPROBE_EVENTS" "GENERIC_TRACER" "FUNCTION_TRACER" "STACK_TRACER" "HIST_TRIGGERS" "BLK_DEV_IO_TRACE" "FAIL_FUTEX" "DYNAMIC_DEBUG"); fi; optionsNo+=("CORESIGHT_CSR" "CORESIGHT_CTI_SAVE_DISABLE" "CORESIGHT_CTI" "CORESIGHT_DBGUI" "CORESIGHT_ETM" "CORESIGHT_ETMV4" "CORESIGHT_EVENT" "CORESIGHT_FUNNEL" "CORESIGHT_FUSE" "CORESIGHT_HWEVENT" "CORESIGHT_QPDI" "CORESIGHT_REMOTE_ETM" "CORESIGHT_REPLICATOR" "CORESIGHT_STM_DEFAULT_ENABLE" "CORESIGHT_STM" "CORESIGHT_TMC" "CORESIGHT_TPDA" "CORESIGHT_TPDM_DEFAULT_ENABLE" "CORESIGHT_TPDM" "CORESIGHT_TPIU" "CORESIGHT" "DEBUG_ATOMIC_SLEEP" "DEBUG_BUS_VOTER" "DEBUG_MUTEXES" "DEBUG_PAGEALLOC" "DEBUG_STACK_USAGE" "FB_MSM_MDSS_XLOG_DEBUG" "HAVE_CORESIGHT_SINK" "HAVE_DEBUG_BUGVERBOSE" "HAVE_DEBUG_KMEMLEAK" "IOMMU_DEBUG" "IOMMU_DEBUG_TRACKING" "IOMMU_TESTS" "L2TP_DEBUGFS" "LOCKUP_DETECTOR" "LOG_BUF_MAGIC" "MSMB_CAMERA_DEBUG" "MSM_CAMERA_DEBUG" "MSM_SMD_DEBUG" "OF_CORESIGHT" "PREEMPT_TRACER" "DEBUG_SPINLOCK");