mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-18 04:14:19 -05:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
af57c5c857
commit
4bab1c31d7
@ -16,7 +16,7 @@ Signed-off-by: Tad <tad@spotco.us>
|
||||
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 @@
|
||||
|
@ -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();
|
||||
|
@ -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<Integer> allPermissionAppIds = new ArrayList<>();
|
||||
final ArrayList<Integer> internetPermissionAppIds = new ArrayList<>();
|
||||
final ArrayList<Integer> 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,
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user