diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-microG_Toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-microG_Toggle.patch index 0b9ad2ef..15cddbfb 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-microG_Toggle.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0016-microG_Toggle.patch @@ -16,7 +16,7 @@ Signed-off-by: Tad create mode 100644 src/com/android/settings/security/SigSpoofPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 6e619cc2c4..15247c1c93 100644 +index 6e619cc2c4..ce056d7ab0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -756,6 +756,9 @@ diff --git a/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-1.patch b/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-1.patch index 4b73c8fd..34d9c511 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-1.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-1.patch @@ -8,7 +8,7 @@ Subject: [PATCH] skip reportNetworkConnectivity() when permission is revoked 1 file changed, 7 insertions(+) diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java -index f741c2bb3..f5bac0613 100644 +index 0a05d4308..26c05c8ec 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java @@ -41,6 +41,7 @@ import android.compat.annotation.UnsupportedAppUsage; @@ -19,7 +19,7 @@ index f741c2bb3..f5bac0613 100644 import android.net.ConnectivityDiagnosticsManager.DataStallReport.DetectionMethod; import android.net.IpSecManager.UdpEncapsulationSocket; import android.net.SocketKeepalive.Callback; -@@ -3358,6 +3359,12 @@ public class ConnectivityManager { +@@ -3406,6 +3407,12 @@ public class ConnectivityManager { */ public void reportNetworkConnectivity(@Nullable Network network, boolean hasConnectivity) { printStackTrace(); diff --git a/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-2.patch b/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-2.patch index b63d0e74..8d941b13 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-2.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Connectivity/0001-Network_Permission-2.patch @@ -30,7 +30,7 @@ index 24b3fed58..065f41fd8 100644 // UID not in map. Default to just INTERNET permission. return 1; diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java -index 0e265f9ef..4509d9f3f 100755 +index 3bf7fdcb5..520dc9e51 100755 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java @@ -392,6 +392,11 @@ public class PermissionMonitor { @@ -130,7 +130,7 @@ index 0e265f9ef..4509d9f3f 100755 if (permission != currentPermission) { final SparseIntArray apps = new SparseIntArray(); -@@ -1097,14 +1111,17 @@ public class PermissionMonitor { +@@ -1134,14 +1148,17 @@ public class PermissionMonitor { * @hide */ @VisibleForTesting @@ -150,7 +150,7 @@ index 0e265f9ef..4509d9f3f 100755 } /** -@@ -1116,7 +1133,7 @@ public class PermissionMonitor { +@@ -1153,7 +1170,7 @@ public class PermissionMonitor { * @hide */ @VisibleForTesting @@ -159,7 +159,7 @@ index 0e265f9ef..4509d9f3f 100755 final ArrayList allPermissionAppIds = new ArrayList<>(); final ArrayList internetPermissionAppIds = new ArrayList<>(); final ArrayList updateStatsPermissionAppIds = new ArrayList<>(); -@@ -1150,29 +1167,41 @@ public class PermissionMonitor { +@@ -1187,29 +1204,41 @@ public class PermissionMonitor { if (allPermissionAppIds.size() != 0) { mBpfNetMaps.setNetPermForUids( PERMISSION_INTERNET | PERMISSION_UPDATE_DEVICE_STATS, diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh index 2a20a6ce..6f0eaab3 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -47,10 +47,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374-alt/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.4/0007.patch @@ -173,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.4/0001.patch -editKernelLocalversion "-dos.p173" +editKernelLocalversion "-dos.p169" else echo "kernel_razer_msm8998 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"