Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-01-18 10:57:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-12-26 15:33:01 -05:00
parent 8b8046fce5
commit 85e3c271ab
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
10 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-14.1/android_frameworks_base/360893.patch
View File

@ -22,8 +22,6 @@ Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2178216b98bf9865edee198f45192f0b883624ab)
Merged-In: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
Change-Id: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
Change-Id: Ieb148594d8e9a6505567f80d78810f687bb6e489
---
packages/VpnDialogs/res/values/strings.xml | 29 ++++++++++
.../com/android/vpndialogs/ConfirmDialog.java | 53 +++++++++++++++++--

10
Patches/LineageOS-14.1/android_frameworks_base/377939.patch
View File

@ -1,4 +1,4 @@
From 52459a71e45159f7fd837a29c2455deebae61424 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marzia Favaro <marziana@google.com>
Date: Mon, 31 Jul 2023 15:10:34 +0000
Subject: [PATCH] BACKPORT: Require permission to unlock keyguard
@ -17,17 +17,15 @@ keyguardGoingAway successfully
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ad8e7e3b1db22684988a179e23639567a4096ca6)
Merged-In: I7ba7e56f954c8e6f1f734311f735215918975bc6
Change-Id: I7ba7e56f954c8e6f1f734311f735215918975bc6
Change-Id: Id9a5ac676c7047c5c4d73b617a1cd628ba885ffe
---
.../core/java/com/android/server/am/ActivityManagerService.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 4e48f422a2fe3..61563f40b825c 100644
index c682ba2f7572..406e08009cb7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -254,6 +254,7 @@
@@ -254,6 +254,7 @@ import cyanogenmod.power.PerformanceManagerInternal;
import libcore.io.IoUtils;
import libcore.util.EmptyArray;
@ -35,7 +33,7 @@ index 4e48f422a2fe3..61563f40b825c 100644
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS;
@@ -6973,6 +6974,7 @@ public void keyguardWaitingForActivityDrawn() {
@@ -7026,6 +7027,7 @@ public final class ActivityManagerService extends ActivityManagerNative
@Override
public void keyguardGoingAway(int flags) {

2
Patches/LineageOS-14.1/android_packages_services_Telephony/365699.patch
View File

@ -16,8 +16,6 @@ Test2: Able to import contact from the primary user or uri with no user id
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ab593467e900d4a6d25a34024a06195ae863f6dc)
Merged-In: I1e3a643f17948153aecc1d0df9ffd9619ad678c1
Change-Id: I1e3a643f17948153aecc1d0df9ffd9619ad678c1
Change-Id: I01cf83cc40bbf13497bc6c90f949f5bb62a833d7
---
.../android/phone/GsmUmtsCallForwardOptions.java | 12 ++++++++++++
.../phone/settings/VoicemailSettingsActivity.java | 13 +++++++++++++

6
Patches/LineageOS-15.1/android_system_bt/377030.patch
View File

@ -1,4 +1,4 @@
From 2b22ff4cc93a2824e14970d212493245362c78d1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: balakrishna <quic_kunthumu@quicinc.com>
Date: Wed, 24 May 2023 13:28:21 +0530
Subject: [PATCH] Fix OOB Write in pin_reply in bluetooth.cc
@ -17,10 +17,10 @@ Change-Id: I15a1eae59b17f633e29180a01676c260189b8353
1 file changed, 1 insertion(+)
diff --git a/btif/src/bluetooth.cc b/btif/src/bluetooth.cc
index b01a4aa30..609ef7a98 100644
index 1121a587d..f827fe9a7 100644
--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -327,6 +327,7 @@ static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
@@ -288,6 +288,7 @@ static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
bt_pin_code_t tmp_pin_code;
/* sanity check */
if (interface_ready() == false) return BT_STATUS_NOT_READY;

6
Patches/LineageOS-15.1/android_system_bt/377031.patch
View File

@ -1,4 +1,4 @@
From 1b97ac8d26a07231e48bfa90ea653d8cd8104428 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: balakrishna <quic_kunthumu@quicinc.com>
Date: Tue, 7 Mar 2023 16:53:46 +0530
Subject: [PATCH] BT: Fixing the rfc_slot_id overflow
@ -17,10 +17,10 @@ Change-Id: I5d7efa34bfb97a6dd8e9d68615d29120a0ae51f0
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/btif/src/btif_sock_rfc.cc b/btif/src/btif_sock_rfc.cc
index 0403c588a..b56fbe12b 100644
index 2ea2a15f9..cd7dbacd4 100644
--- a/btif/src/btif_sock_rfc.cc
+++ b/btif/src/btif_sock_rfc.cc
@@ -215,7 +215,11 @@ static rfc_slot_t* alloc_rfc_slot(const RawAddress* addr, const char* name,
@@ -207,7 +207,11 @@ static rfc_slot_t* alloc_rfc_slot(const RawAddress* addr, const char* name,
}
// Increment slot id and make sure we don't use id=0.

4
Patches/LineageOS-16.0/android_frameworks_base/0007-Always_Restict_Serial.patch
View File

@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 0a8c45cb16cf..0ab8a709cced 100644
index 847beb87408d..d47abf142ef7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7936,13 +7936,7 @@ public class ActivityManagerService extends IActivityManager.Stub
@@ -7937,13 +7937,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}

6
Patches/LineageOS-16.0/android_system_bt/377031.patch
View File

@ -1,4 +1,4 @@
From 1b97ac8d26a07231e48bfa90ea653d8cd8104428 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: balakrishna <quic_kunthumu@quicinc.com>
Date: Tue, 7 Mar 2023 16:53:46 +0530
Subject: [PATCH] BT: Fixing the rfc_slot_id overflow
@ -17,10 +17,10 @@ Change-Id: I5d7efa34bfb97a6dd8e9d68615d29120a0ae51f0
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/btif/src/btif_sock_rfc.cc b/btif/src/btif_sock_rfc.cc
index 0403c588a..b56fbe12b 100644
index 4b490a0e3..e0cc427e1 100644
--- a/btif/src/btif_sock_rfc.cc
+++ b/btif/src/btif_sock_rfc.cc
@@ -215,7 +215,11 @@ static rfc_slot_t* alloc_rfc_slot(const RawAddress* addr, const char* name,
@@ -209,7 +209,11 @@ static rfc_slot_t* alloc_rfc_slot(const RawAddress* addr, const char* name,
}
// Increment slot id and make sure we don't use id=0.

2
Patches/LineageOS-17.1/android_tools_apksig/360973-backport.patch
View File

@ -15,8 +15,6 @@ Test: gradlew test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea0632935646f2f6bf5822a5e9c97885269780bd)
Merged-In: I77f4218599511ff4f9f3790e4942a329d5a18da4
Change-Id: I77f4218599511ff4f9f3790e4942a329d5a18da4
Change-Id: I604ce656e6dcd750e664adcb814c5c66f7b80ce1
---
.../java/com/android/apksig/ApkVerifier.java | 29 +++++
.../internal/apk/v1/V1SchemeSigner.java | 7 ++

4
Scripts/LineageOS-16.0/Patch.sh
View File

@ -363,8 +363,8 @@ applyPatch "$DOS_PATCHES/android_packages_services_Telephony/0002-More_Preferred
fi;
if enterAndClear "system/bt"; then
applyPatch "$DOS_PATCHES/android_system_bt/377030.patch"; #R_asb_2023-12 Fix OOB Write in pin_reply in bluetooth.cc
applyPatch "$DOS_PATCHES/android_system_bt/377031-backport.patch"; #R_asb_2023-12 BT: Fixing the rfc_slot_id overflow
applyPatch "$DOS_PATCHES/android_system_bt/377030-backport.patch"; #R_asb_2023-12 Fix OOB Write in pin_reply in bluetooth.cc
applyPatch "$DOS_PATCHES/android_system_bt/377031.patch"; #R_asb_2023-12 BT: Fixing the rfc_slot_id overflow
#applyPatch "$DOS_PATCHES_COMMON/android_system_bt/0001-alloc_size.patch"; #Add alloc_size attributes to the allocator (GrapheneOS)
fi;

20
Scripts/LineageOS-17.1/Functions.sh
View File

@ -79,16 +79,16 @@ patchWorkspaceReal() {
source build/envsetup.sh;
#repopick -it ten-firewall;
repopick -fit Q_asb_2023-03 -e 352333;
repopick -fit Q_asb_2023-04;
repopick -fit Q_asb_2023-05;
repopick -fit Q_asb_2023-06 -e 359414,359417,359416,359413,359412,359389,359386;
repopick -fit Q_asb_2023-07 -e 362202,365416,365408,365407,376558;
repopick -fit Q_asb_2023-08 -e 365443,365454,365451,365449,365459;
repopick -fit Q_asb_2023-09 -e 368011,368008,368006,368005;
repopick -fit Q_asb_2023-10 -e 376554,369701,369696;
repopick -fit Q_asb_2023-11 -e 376555,376568,376603;
repopick -fit Q_asb_2023-12 -e 377251,378052,378071;
repopick -it Q_asb_2023-03 -e 352333;
repopick -it Q_asb_2023-04;
repopick -it Q_asb_2023-05;
repopick -it Q_asb_2023-06;
repopick -it Q_asb_2023-07 -e 362202;
repopick -it Q_asb_2023-08 -e 365443;
repopick -it Q_asb_2023-09;
repopick -it Q_asb_2023-10 -e 376554;
repopick -it Q_asb_2023-11 -e 376555;
repopick -it Q_asb_2023-12 -e 377251;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";