mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-08-03 03:46:07 -04:00
Fixup + Churn
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
parent
f0de4dbf4c
commit
236a403d12
6 changed files with 14 additions and 14 deletions
|
@ -1,7 +1,7 @@
|
|||
From e4ea22f79e2995c16f19b45925d4dd66f9813646 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martijn Coenen <maco@google.com>
|
||||
Date: Thu, 29 Feb 2024 12:03:05 +0000
|
||||
Subject: [PATCH] [BACKPORT] Verify UID of incoming Zygote connections.
|
||||
Subject: [PATCH] Verify UID of incoming Zygote connections.
|
||||
|
||||
Only the system UID should be allowed to connect to the Zygote. While
|
||||
for generic Zygotes this is also covered by SELinux policy, this is not
|
||||
|
@ -31,7 +31,7 @@ Change-Id: I3f85a17107849e2cd3e82d6ef15c90b9e2f26532
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
|
||||
index 85d84bb3f9867..40ab4839195bc 100644
|
||||
index 85d84bb3f986..40ab4839195b 100644
|
||||
--- a/core/java/com/android/internal/os/ZygoteConnection.java
|
||||
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
|
||||
@@ -104,6 +104,10 @@ class ZygoteConnection {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 9dabeb4f8d2ab8936c84823786fab90d0e929ce3 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Delwiche <delwiche@google.com>
|
||||
Date: Mon, 22 Apr 2024 21:14:56 +0000
|
||||
Subject: [PATCH] [BACKPORT] Fix an authentication bypass bug in SMP
|
||||
Subject: [PATCH] Fix an authentication bypass bug in SMP
|
||||
|
||||
When pairing with BLE legacy pairing initiated
|
||||
from remote, authentication can be bypassed.
|
||||
|
@ -20,7 +20,7 @@ Change-Id: I66b1f9a80060f48a604001829db8ea7c96c7b7f8
|
|||
2 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/stack/smp/smp_act.c b/stack/smp/smp_act.c
|
||||
index 8702e109578..a9bcd4c87c2 100644
|
||||
index 7491d0972..925bcd832 100644
|
||||
--- a/stack/smp/smp_act.c
|
||||
+++ b/stack/smp/smp_act.c
|
||||
@@ -331,6 +331,7 @@ void smp_send_confirm(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
|
||||
|
@ -31,7 +31,7 @@ index 8702e109578..a9bcd4c87c2 100644
|
|||
}
|
||||
|
||||
/*******************************************************************************
|
||||
@@ -704,6 +705,16 @@ void smp_proc_init(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
|
||||
@@ -720,6 +721,16 @@ void smp_proc_init(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,7 @@ index 8702e109578..a9bcd4c87c2 100644
|
|||
STREAM_TO_ARRAY(p_cb->rrand, p, BT_OCTET16_LEN);
|
||||
}
|
||||
diff --git a/stack/smp/smp_int.h b/stack/smp/smp_int.h
|
||||
index aea85380edd..aac64ea2ef1 100644
|
||||
index bfac772b9..ab7676861 100644
|
||||
--- a/stack/smp/smp_int.h
|
||||
+++ b/stack/smp/smp_int.h
|
||||
@@ -251,6 +251,7 @@ typedef union
|
||||
|
|
|
@ -17,7 +17,7 @@ Signed-off-by: Tad <tad@spotco.us>
|
|||
create mode 100644 src/com/android/settings/security/OpenEuiccPreferenceController.java
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index ce056d7ab0..27c7f9abc7 100644
|
||||
index ce056d7ab0..7dcc89b560 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -759,6 +759,9 @@
|
||||
|
@ -25,7 +25,7 @@ index ce056d7ab0..27c7f9abc7 100644
|
|||
<string name="sig_spoof_summary">Allows official builds of microG apps to function. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
|
||||
|
||||
+ <string name="openeuicc_title">Enable eUICC management</string>
|
||||
+ <string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Reboot required after toggling. Requires reboot.</string>
|
||||
+ <string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Requires reboot.</string>
|
||||
+
|
||||
<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
|
||||
<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>
|
||||
|
|
|
@ -17,12 +17,12 @@ Signed-off-by: Tad <tad@spotco.us>
|
|||
create mode 100644 src/com/android/settings/security/CarrierConfig2PreferenceController.java
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 27c7f9abc7..2543ef0677 100644
|
||||
index 7dcc89b560..cd6ee50ad7 100644
|
||||
--- a/res/values/strings.xml
|
||||
+++ b/res/values/strings.xml
|
||||
@@ -762,6 +762,9 @@
|
||||
<string name="openeuicc_title">Enable eUICC management</string>
|
||||
<string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Reboot required after toggling. Requires reboot.</string>
|
||||
<string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Requires reboot.</string>
|
||||
|
||||
+ <string name="carrierconfig2_title">Enable CarrierConfig2</string>
|
||||
+ <string name="carrierconfig2_summary">Use a larger Google database instead of the AOSP database for carrier specific configurations. May improve cellular network compatibility & functionality. Requires reboot.</string>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue