Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-24 23:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Churn + Fixup

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-12-17 08:03:00 -05:00
parent d8d0c47a60
commit dcc02bc9c9
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
50 changed files with 165 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Logs/resetWorkspace-LineageOS-15.1.txt
View File

@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
external/chromium-webview 4a9cf619f77955ea20f608a193006dcdf1b21e21
external/chromium-webview 8f46a2d79931fb53d34852fbe776a5adab77bf49
external/clang 751a76679b0fb5798ea6cab75906df07edcab315
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

2
Logs/resetWorkspace-LineageOS-16.0.txt
View File

@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
external/chromium-webview 4a9cf619f77955ea20f608a193006dcdf1b21e21
external/chromium-webview 8f46a2d79931fb53d34852fbe776a5adab77bf49
external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

4
Logs/resetWorkspace-LineageOS-17.1.txt
View File

@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
external/chromium-webview 4a9cf619f77955ea20f608a193006dcdf1b21e21
external/chromium-webview 8f46a2d79931fb53d34852fbe776a5adab77bf49
external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
@ -726,7 +726,7 @@ tools/external_updater 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f
tools/loganalysis eec32327da28db6f5e599a4ab76f7c93995896ef
tools/metalava edcafddcb54e149af8d4135a346501dde802fb30
tools/ndkports 74fefbc2160250129cbd157272fcfb3c9ac20f18
tools/repohooks 17bc37e59b3c332a9740b97e01b239ffa309503f
tools/repohooks 3c3e968d4776bde0c775e3eec6c9228121bc0e05
tools/security 3c5ee5d6f2f50895611eacd71a62b11efcfb0648
tools/test/connectivity 4857a1a24ab6fd537bc4186fc88548c2b9c29e82
tools/test/graphicsbenchmark 143e833b3762e93b0a1fe6a6bc127f09e5afade8

2
Patches/LineageOS-15.1/android_external_skia/410675-backport.patch
View File

@ -21,7 +21,7 @@ Change-Id: Id1a30592d435bd0de4630e7047f26b0dc17654fc
1 file changed, 8 insertions(+)
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index 6952ec4f11..8ae2102c0e 100644
index 95339218b0..6051f16e52 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -10,6 +10,7 @@

9
Patches/LineageOS-15.1/android_system_bt/411488.patch
View File

@ -1,8 +1,7 @@
From 9f73a10e0bd1ac2f6d8e3fe612fb9ff2f1839d63 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 8 Jul 2024 22:42:18 +0000
Subject: [PATCH] [BACKPORT] Fix OOB write in build_read_multi_rsp of
gatt_sr.cc
Subject: [PATCH] Fix OOB write in build_read_multi_rsp of gatt_sr.cc
build_read_multi_rsp is missing a bounds check, which can lead to an
OOB write when the mtu parameter is set to zero.
@ -24,10 +23,10 @@ Change-Id: Icc8209aec68873c9821a36c579cd5df05c6ec8b8
1 file changed, 8 insertions(+)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 252732c739..9a875d742d 100644
index 1b9988739..11a4d1b4e 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -136,6 +136,14 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
@@ -133,6 +133,14 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
/* Wait till we get all the responses */
if (fixed_queue_length(p_cmd->multi_rsp_q) ==
p_cmd->multi_req.num_handles) {

6
Patches/LineageOS-15.1/android_system_bt/411489-backport.patch
View File

@ -18,7 +18,7 @@ Change-Id: Ia60dd829ff9152c083de1f4c1265bb3ad595dcc4
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 28e7d3415..e80070b05 100644
index 11a4d1b4e..413f91c80 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -23,6 +23,7 @@
@ -29,7 +29,7 @@ index 28e7d3415..e80070b05 100644
#include "bt_target.h"
#include "bt_utils.h"
#include "osi/include/osi.h"
@@ -170,9 +171,21 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
@@ -168,9 +169,21 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
}
if (p_rsp != NULL) {
@ -52,7 +52,7 @@ index 28e7d3415..e80070b05 100644
/* just send the partial response for the overflow case */
len = p_rsp->attr_value.len - (total_len - mtu);
is_overflow = true;
@@ -184,15 +197,8 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
@@ -182,15 +195,8 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
}
if (p_rsp->attr_value.handle == p_cmd->multi_req.handles[ii]) {

8
Patches/LineageOS-15.1/android_system_bt/411490.patch
View File

@ -1,7 +1,7 @@
From 425cc51af8d1662dacab60330628a6adfd1a404f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Paw=C5=82owski?= <jpawlowski@google.com>
Date: Thu, 1 Aug 2024 14:12:58 +0000
Subject: [PATCH] [BACKPORT] Fix "GATT Read Multiple Variable Response" builder
Subject: [PATCH] Fix "GATT Read Multiple Variable Response" builder
0 length value is perfectly fine, and should result in just length
added into the packet.
@ -23,10 +23,10 @@ Change-Id: Ida4f6b566cf9fa40fc5330d8084c29669ccaa608
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index c0c1486af0..d94221682d 100644
index 413f91c80..e2f011a0a 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -180,7 +180,7 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
@@ -178,7 +178,7 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
len = std::min((size_t) p_rsp->attr_value.len, mtu - total_len);

12
Patches/LineageOS-16.0/android_frameworks_base/411487.patch
View File

@ -1,4 +1,4 @@
From b958e5cbbb8982c37dcc60f076e9e71a85588c87 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Thu, 29 Aug 2024 17:01:55 +0000
Subject: [PATCH] Properly handle onNullBinding() in appwidget service.
@ -15,10 +15,10 @@ Change-Id: I12fccb572e159a73785aa33a4f5204e094ccd1b7
2 files changed, 15 insertions(+)
diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index e58f08a799655..d64a3b5ee16ba 100644
index e5ae0ca0070c..797689beb582 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/core/java/android/widget/RemoteViewsAdapter.java
@@ -238,6 +238,11 @@ public void onServiceDisconnected(ComponentName name) {
@@ -229,6 +229,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
}
}
@ -31,10 +31,10 @@ index e58f08a799655..d64a3b5ee16ba 100644
public void handleMessage(Message msg) {
RemoteViewsAdapter adapter = mAdapter.get();
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index f989f73b11b10..709a206a39c77 100644
index 9c18029ec693..ba1eacad3935 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1888,6 +1888,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
@@ -1872,6 +1872,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
mContext.unbindService(this);
}
@ -46,7 +46,7 @@ index f989f73b11b10..709a206a39c77 100644
@Override
public void onServiceDisconnected(ComponentName name) {
// Do nothing
@@ -2028,6 +2033,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
@@ -2013,6 +2018,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
mContext.unbindService(this);
}

9
Patches/LineageOS-16.0/android_system_bt/411488.patch
View File

@ -1,8 +1,7 @@
From 9f73a10e0bd1ac2f6d8e3fe612fb9ff2f1839d63 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 8 Jul 2024 22:42:18 +0000
Subject: [PATCH] [BACKPORT] Fix OOB write in build_read_multi_rsp of
gatt_sr.cc
Subject: [PATCH] Fix OOB write in build_read_multi_rsp of gatt_sr.cc
build_read_multi_rsp is missing a bounds check, which can lead to an
OOB write when the mtu parameter is set to zero.
@ -24,10 +23,10 @@ Change-Id: Icc8209aec68873c9821a36c579cd5df05c6ec8b8
1 file changed, 8 insertions(+)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 252732c739..9a875d742d 100644
index d4e3c046b..28e7d3415 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -136,6 +136,14 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
@@ -135,6 +135,14 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,
/* Wait till we get all the responses */
if (fixed_queue_length(p_cmd->multi_rsp_q) ==
p_cmd->multi_req.num_handles) {

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

@ -1,7 +1,7 @@
From 425cc51af8d1662dacab60330628a6adfd1a404f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Paw=C5=82owski?= <jpawlowski@google.com>
Date: Thu, 1 Aug 2024 14:12:58 +0000
Subject: [PATCH] [BACKPORT] Fix "GATT Read Multiple Variable Response" builder
Subject: [PATCH] Fix "GATT Read Multiple Variable Response" builder
0 length value is perfectly fine, and should result in just length
added into the packet.
@ -23,7 +23,7 @@ Change-Id: Ida4f6b566cf9fa40fc5330d8084c29669ccaa608
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index c0c1486af0..d94221682d 100644
index e80070b05..1cfa1796a 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -180,7 +180,7 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,

2
Patches/LineageOS-17.1/android_external_skia/411484-backport.patch
View File

@ -21,7 +21,7 @@ Change-Id: Id1a30592d435bd0de4630e7047f26b0dc17654fc
1 file changed, 8 insertions(+)
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index be3e182cd1..8f48b7f16d 100644
index be3e182cd1..40631f1f06 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -10,6 +10,7 @@

6
Patches/LineageOS-17.1/android_external_skia/411485.patch
View File

@ -1,4 +1,4 @@
From 6f447355dd4fd0cfdf7c49b688149c71390194cb Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Thu, 29 Aug 2024 12:47:48 -0400
Subject: [PATCH] RESTRICT AUTOMERGE: Check for size overflow before allocating
@ -20,10 +20,10 @@ Change-Id: I74c081a7b849f13194ec7807b7a748d1919c1bb2
1 file changed, 3 insertions(+)
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index bd7accae8d2..e16f6ee7698 100644
index e175d2ef62..42cb9951f1 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -316,6 +316,9 @@ static bool prepare_to_draw_into_mask(const SkRect& bounds, SkMask* mask) {
@@ -315,6 +315,9 @@ static bool prepare_to_draw_into_mask(const SkRect& bounds, SkMask* mask) {
mask->fRowBytes = SkAlign4(mask->fBounds.width());
mask->fFormat = SkMask::kA8_Format;
const size_t size = mask->computeImageSize();

6
Patches/LineageOS-17.1/android_external_skia/411486.patch
View File

@ -1,4 +1,4 @@
From 7f44cab6fa5bc8ff805795f88d0912612e849224 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Thu, 29 Aug 2024 11:52:35 -0400
Subject: [PATCH] Prevent overflow when growing an SkRegion's RunArray
@ -17,10 +17,10 @@ Change-Id: Iea27fe62ef97deb8a75e8dae276657d809223b57
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 73707c2b876..275410cbd22 100644
index 9176c7a55c..f97da2e9dd 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -52,8 +52,10 @@ class RunArray {
@@ -53,8 +53,10 @@ public:
/** Resize the array to a size greater-than-or-equal-to count. */
void resizeToAtLeast(int count) {
if (count > fCount) {

2
Patches/LineageOS-17.1/android_frameworks_base/0013-Private_DNS.patch
View File

@ -21,7 +21,7 @@ Change-Id: Id75a774ce1ed109a83c6a5bf512536c643165d71
2 files changed, 170 insertions(+)
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 111a8c48a46c..962c4215f7b6 100644
index 111a8c48a46c..e486dc52b4d8 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -757,6 +757,58 @@ public class ConnectivityManager {

2
Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-6.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] skip reportNetworkConnectivity() when permission is revoked
1 file changed, 8 insertions(+)
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 962c4215f7b6..089f6b65a908 100644
index e486dc52b4d8..cb0fadb87edf 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -17,6 +17,7 @@ package android.net;

6
Patches/LineageOS-17.1/android_frameworks_base/408524.patch
View File

@ -1,4 +1,4 @@
From c913dee38cbeaae19c5f12c37aec25654d74b671 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Thu, 11 Jul 2024 12:39:22 -0700
Subject: [PATCH] Update AccountManagerService checkKeyIntent.
@ -17,10 +17,10 @@ Change-Id: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index bf577735d0372..e8c8b32884e96 100644
index bf577735d037..e8c8b32884e9 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4822,6 +4822,9 @@ protected boolean checkKeyIntent(int authUid, Bundle bundle) {
@@ -4822,6 +4822,9 @@ public class AccountManagerService
if (resolveInfo == null) {
return false;
}

6
Patches/LineageOS-17.1/android_frameworks_base/408525.patch
View File

@ -1,4 +1,4 @@
From 4ffd411d62fe0a866c0ed0852260e2834c202630 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Loh <wloh@google.com>
Date: Mon, 3 Jun 2024 12:56:47 -0700
Subject: [PATCH] Fail parseUri if end is missing
@ -15,10 +15,10 @@ Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
1 file changed, 3 insertions(+)
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 72e0fa615b092..0685466bfa74e 100644
index 72e0fa615b09..0685466bfa74 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -6708,6 +6708,9 @@ public static Intent parseUri(String uri, @UriFlags int flags) throws URISyntaxE
@@ -6708,6 +6708,9 @@ public class Intent implements Parcelable, Cloneable {
int eq = uri.indexOf('=', i);
if (eq < 0) eq = i-1;
int semi = uri.indexOf(';', i);

10
Patches/LineageOS-17.1/android_frameworks_base/408526.patch
View File

@ -1,8 +1,8 @@
From d336d741ce6aa201cb81de38153bb367921fdf9d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sumedh Sen <sumedhsen@google.com>
Date: Wed, 17 Jul 2024 01:00:55 +0000
Subject: [PATCH] [RESTRICT AUTOMERGE] Check whether installerPackageName
contains only valid characters
Subject: [PATCH] Check whether installerPackageName contains only valid
characters
Bug: 341256391
Bug: 307532206
@ -15,10 +15,10 @@ Change-Id: I74a172c617d6f5b13f0708092156b657b73b5891
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 8715b183d142b..6c77a9575dcb5 100644
index 8715b183d142..6c77a9575dcb 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -549,12 +549,17 @@ private int createSessionInternal(SessionParams params, String installerPackageN
@@ -549,12 +549,17 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
params.appLabel = TextUtils.trimToSize(params.appLabel,
PackageItemInfo.MAX_SAFE_LABEL_LENGTH);

6
Patches/LineageOS-17.1/android_frameworks_base/410985.patch
View File

@ -1,4 +1,4 @@
From 90f15826f146b6487064f3a680f129ea50c32f71 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 2 Jul 2024 11:02:07 -0700
Subject: [PATCH] Remove authenticator data if it was disabled.
@ -15,10 +15,10 @@ Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
1 file changed, 4 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index e8c8b32884e96..f99e82f74f6eb 100644
index e8c8b32884e9..f99e82f74f6e 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1165,6 +1165,10 @@ private void validateAccountsInternal(
@@ -1165,6 +1165,10 @@ public class AccountManagerService
obsoleteAuthType.add(type);
// And delete it from the TABLE_META
accountsDb.deleteMetaByAuthTypeAndUid(type, uid);

14
Patches/LineageOS-17.1/android_frameworks_base/410986.patch
View File

@ -1,4 +1,4 @@
From 52ea93cd8fc8e703ecbad0efef526cd3a7f17617 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 24 Jun 2024 17:29:14 -0700
Subject: [PATCH] RingtoneManager: allow video ringtone URI
@ -17,10 +17,10 @@ Change-Id: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index ad4751165d306..ea1cddca99d16 100644
index ad4751165d30..ea1cddca99d1 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -824,9 +824,13 @@ public static void setActualDefaultRingtoneUri(Context context, int type, Uri ri
@@ -824,9 +824,13 @@ public class RingtoneManager {
+ " ignored: failure to find mimeType (no access from this context?)");
return;
}
@ -37,10 +37,10 @@ index ad4751165d306..ea1cddca99d16 100644
}
}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 7cb41275984e4..02165eb8a2137 100644
index 7cb41275984e..02165eb8a213 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1734,7 +1734,7 @@ private boolean mutateSystemSetting(String name, String value, int runAsUserId,
@@ -1734,7 +1734,7 @@ public class SettingsProvider extends ContentProvider {
cacheName = Settings.System.ALARM_ALERT_CACHE;
}
if (cacheName != null) {
@ -49,7 +49,7 @@ index 7cb41275984e4..02165eb8a2137 100644
return false;
}
final File cacheFile = new File(
@@ -1769,7 +1769,7 @@ owningUserId, name, value, null, false, getCallingPackage(),
@@ -1769,7 +1769,7 @@ public class SettingsProvider extends ContentProvider {
}
}
@ -58,7 +58,7 @@ index 7cb41275984e4..02165eb8a2137 100644
if (uri != null) {
Uri audioUri = Uri.parse(uri);
if (Settings.AUTHORITY.equals(
@@ -1787,10 +1787,13 @@ private boolean isValidAudioUri(String name, String uri) {
@@ -1787,10 +1787,13 @@ public class SettingsProvider extends ContentProvider {
return false;
}
if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg")

20
Patches/LineageOS-17.1/android_frameworks_base/410987.patch
View File

@ -1,4 +1,4 @@
From 0fd389af4bbeff48cfb1faff5a31803f55003514 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ioana Alexandru <aioana@google.com>
Date: Wed, 31 Jul 2024 13:46:30 +0000
Subject: [PATCH] Check more URIs in notifications
@ -19,10 +19,10 @@ Change-Id: I1ce6bebd9452466d005505dc5b99a0fdc0e05e80
3 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index e7f226d091d6d..61a355ddbc77d 100644
index e7f226d091d6..61a355ddbc77 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -2486,29 +2486,22 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
@@ -2486,29 +2486,22 @@ public class Notification implements Parcelable
ArrayList<Person> people = extras.getParcelableArrayList(EXTRA_PEOPLE_LIST);
if (people != null && !people.isEmpty()) {
for (Person p : people) {
@ -56,7 +56,7 @@ index e7f226d091d6d..61a355ddbc77d 100644
}
}
@@ -2516,12 +2509,7 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
@@ -2516,12 +2509,7 @@ public class Notification implements Parcelable
if (!ArrayUtils.isEmpty(historic)) {
for (MessagingStyle.Message message : MessagingStyle.Message
.getMessagesFromBundleArray(historic)) {
@ -70,7 +70,7 @@ index e7f226d091d6d..61a355ddbc77d 100644
}
}
}
@@ -7779,6 +7767,18 @@ static Bundle[] getBundleArrayForMessages(List<Message> messages) {
@@ -7779,6 +7767,18 @@ public class Notification implements Parcelable
return bundles;
}
@ -90,10 +90,10 @@ index e7f226d091d6d..61a355ddbc77d 100644
* @return A list of messages read from the bundles.
*
diff --git a/core/java/android/app/Person.java b/core/java/android/app/Person.java
index b5820ba70020c..f6b9054ef0cc5 100644
index b5820ba70020..f6b9054ef0cc 100644
--- a/core/java/android/app/Person.java
+++ b/core/java/android/app/Person.java
@@ -24,6 +24,7 @@
@@ -24,6 +24,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import java.util.Objects;
@ -101,7 +101,7 @@ index b5820ba70020c..f6b9054ef0cc5 100644
/**
* Provides an immutable reference to an entity that appears repeatedly on different surfaces of the
@@ -176,6 +177,22 @@ public void writeToParcel(Parcel dest, @WriteFlags int flags) {
@@ -176,6 +177,22 @@ public final class Person implements Parcelable {
dest.writeBoolean(mIsBot);
}
@ -125,10 +125,10 @@ index b5820ba70020c..f6b9054ef0cc5 100644
public static class Builder {
@Nullable private CharSequence mName;
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index c2e591950e25a..9f51fbf025700 100644
index c2e591950e25..9f51fbf02570 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -761,6 +761,13 @@ public int getActionTag() {
@@ -761,6 +761,13 @@ public class RemoteViews implements Parcelable, Filter {
return SET_REMOTE_VIEW_ADAPTER_LIST_TAG;
}

14
Patches/LineageOS-17.1/android_frameworks_base/410988.patch
View File

@ -1,4 +1,4 @@
From dcb0d9a1881ac39d3fb576c6af07b1f7dd1dc7e1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Puma Hsu <pumahsu@google.com>
Date: Mon, 9 Mar 2020 16:57:43 +0800
Subject: [PATCH] Fix function setting failed in Developer options
@ -27,10 +27,10 @@ Change-Id: I1933c098e47496b8d6813a5a4e295bcf12027401
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 434592f129b36..dd2198106b32b 100644
index 434592f129b3..dd2198106b32 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -461,7 +461,6 @@ private static void initRndisAddress() {
@@ -461,7 +461,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
abstract static class UsbHandler extends Handler {
// current USB state
@ -38,7 +38,7 @@ index 434592f129b36..dd2198106b32b 100644
private boolean mHostConnected;
private boolean mSourcePower;
private boolean mSinkPower;
@@ -489,6 +488,7 @@ abstract static class UsbHandler extends Handler {
@@ -489,6 +488,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
private final UsbSettingsManager mSettingsManager;
private NotificationManager mNotificationManager;
@ -46,7 +46,7 @@ index 434592f129b36..dd2198106b32b 100644
protected long mScreenUnlockedFunctions;
protected boolean mBootCompleted;
protected boolean mCurrentFunctionsApplied;
@@ -1834,7 +1834,8 @@ public void handleMessage(Message msg) {
@@ -1834,7 +1834,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
case MSG_SET_FUNCTIONS_TIMEOUT:
Slog.e(TAG, "Set functions timed out! no reply from usb hal");
if (msg.arg1 != 1) {
@ -56,7 +56,7 @@ index 434592f129b36..dd2198106b32b 100644
}
break;
case MSG_GET_CURRENT_USB_FUNCTIONS:
@@ -1856,7 +1857,8 @@ public void handleMessage(Message msg) {
@@ -1856,7 +1857,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
* Dont force to default when the configuration is already set to default.
*/
if (msg.arg1 != 1) {
@ -66,7 +66,7 @@ index 434592f129b36..dd2198106b32b 100644
}
break;
case MSG_GADGET_HAL_REGISTERED:
@@ -1957,8 +1959,11 @@ private void setUsbConfig(long config, boolean chargingFunctions) {
@@ -1957,8 +1959,11 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
SET_FUNCTIONS_TIMEOUT_MS - SET_FUNCTIONS_LEEWAY_MS);
sendMessageDelayed(MSG_SET_FUNCTIONS_TIMEOUT, chargingFunctions,
SET_FUNCTIONS_TIMEOUT_MS);

8
Patches/LineageOS-17.1/android_frameworks_base/410989.patch
View File

@ -1,4 +1,4 @@
From b798244c86fbd567b1a8ec17e9d267316be4b28e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Gupta <kumarashishg@google.com>
Date: Wed, 31 Jul 2024 16:02:29 +0000
Subject: [PATCH] Set no data transfer on function switch timeout for accessory
@ -23,10 +23,10 @@ Change-Id: I698e9df0333cbb51dd9bd5917a94d81273a2784a
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index dd2198106b32b..19b86b21216a4 100644
index dd2198106b32..19b86b21216a 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -673,7 +673,7 @@ private void updateCurrentAccessory() {
@@ -673,7 +673,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
}
}
@ -35,7 +35,7 @@ index dd2198106b32b..19b86b21216a4 100644
// make sure accessory mode is off
// and restore default functions
Slog.d(TAG, "exited USB accessory mode");
@@ -1857,8 +1857,13 @@ public void handleMessage(Message msg) {
@@ -1857,8 +1857,13 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
* Dont force to default when the configuration is already set to default.
*/
if (msg.arg1 != 1) {

8
Patches/LineageOS-17.1/android_frameworks_base/410990.patch
View File

@ -1,4 +1,4 @@
From 07a25bc41ce0a6911255373e096a60f595aca8d8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: lpeter <lpeter@google.com>
Date: Tue, 6 Aug 2024 09:22:12 +0000
Subject: [PATCH] Disallow device admin package and protected packages to be
@ -21,10 +21,10 @@ Change-Id: I4e913a12477fd4a64990033eaae533e30863e2a2
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d27b5ad0d6464..d304f29ec1957 100644
index d27b5ad0d646..d304f29ec195 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13666,6 +13666,9 @@ int installExistingPackageAsUser(@Nullable String packageName, @UserIdInt int us
@@ -13666,6 +13666,9 @@ public class PackageManagerService extends IPackageManager.Stub
(installFlags & PackageManager.INSTALL_INSTANT_APP) != 0;
final boolean fullApp =
(installFlags & PackageManager.INSTALL_FULL_APP) != 0;
@ -34,7 +34,7 @@ index d27b5ad0d6464..d304f29ec1957 100644
// writer
synchronized (mPackages) {
@@ -13673,7 +13676,8 @@ int installExistingPackageAsUser(@Nullable String packageName, @UserIdInt int us
@@ -13673,7 +13676,8 @@ public class PackageManagerService extends IPackageManager.Stub
if (pkgSetting == null) {
return PackageManager.INSTALL_FAILED_INVALID_URI;
}

16
Patches/LineageOS-17.1/android_frameworks_base/410991.patch
View File

@ -1,4 +1,4 @@
From 3e0d2fe6c935a72da1862cb6c9010f7adc567f58 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 30 Aug 2024 17:22:59 +0000
Subject: [PATCH] RESTRICT AUTOMERGE Clear app-provided shortcut icons
@ -18,10 +18,10 @@ Change-Id: If7e291eb2254c3cbec23673c65e7477e6ad45b09
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/core/java/android/view/KeyboardShortcutInfo.java b/core/java/android/view/KeyboardShortcutInfo.java
index 2660e74dcb205..2075d77a9871e 100644
index 2660e74dcb20..2075d77a9871 100644
--- a/core/java/android/view/KeyboardShortcutInfo.java
+++ b/core/java/android/view/KeyboardShortcutInfo.java
@@ -29,7 +29,7 @@
@@ -29,7 +29,7 @@ import android.os.Parcelable;
*/
public final class KeyboardShortcutInfo implements Parcelable {
private final CharSequence mLabel;
@ -30,7 +30,7 @@ index 2660e74dcb205..2075d77a9871e 100644
private final char mBaseCharacter;
private final int mKeycode;
private final int mModifiers;
@@ -115,6 +115,15 @@ public Icon getIcon() {
@@ -115,6 +115,15 @@ public final class KeyboardShortcutInfo implements Parcelable {
return mIcon;
}
@ -46,7 +46,7 @@ index 2660e74dcb205..2075d77a9871e 100644
/**
* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the
* base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are
@@ -165,4 +174,4 @@ public KeyboardShortcutInfo[] newArray(int size) {
@@ -165,4 +174,4 @@ public final class KeyboardShortcutInfo implements Parcelable {
return new KeyboardShortcutInfo[size];
}
};
@ -54,10 +54,10 @@ index 2660e74dcb205..2075d77a9871e 100644
\ No newline at end of file
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
index 7e6ddcfea7620..cc373d3c8b0f1 100644
index 7e6ddcfea762..cc373d3c8b0f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
@@ -378,6 +378,7 @@ private void showKeyboardShortcuts(int deviceId) {
@@ -378,6 +378,7 @@ public final class KeyboardShortcuts {
@Override
public void onKeyboardShortcutsReceived(
final List<KeyboardShortcutGroup> result) {
@ -65,7 +65,7 @@ index 7e6ddcfea7620..cc373d3c8b0f1 100644
result.add(getSystemShortcuts());
final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
if (appShortcuts != null) {
@@ -388,6 +389,14 @@ public void onKeyboardShortcutsReceived(
@@ -388,6 +389,14 @@ public final class KeyboardShortcuts {
}, deviceId);
}

12
Patches/LineageOS-17.1/android_frameworks_base/411487.patch
View File

@ -1,4 +1,4 @@
From b958e5cbbb8982c37dcc60f076e9e71a85588c87 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Thu, 29 Aug 2024 17:01:55 +0000
Subject: [PATCH] Properly handle onNullBinding() in appwidget service.
@ -15,10 +15,10 @@ Change-Id: I12fccb572e159a73785aa33a4f5204e094ccd1b7
2 files changed, 15 insertions(+)
diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index e58f08a799655..d64a3b5ee16ba 100644
index efc5eb373e00..12743376c3e0 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/core/java/android/widget/RemoteViewsAdapter.java
@@ -238,6 +238,11 @@ public void onServiceDisconnected(ComponentName name) {
@@ -238,6 +238,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
}
}
@ -31,10 +31,10 @@ index e58f08a799655..d64a3b5ee16ba 100644
public void handleMessage(Message msg) {
RemoteViewsAdapter adapter = mAdapter.get();
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index f989f73b11b10..709a206a39c77 100644
index 2fe14e36ec51..a06af5bbac1e 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1888,6 +1888,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
@@ -1873,6 +1873,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
mContext.unbindService(this);
}
@ -46,7 +46,7 @@ index f989f73b11b10..709a206a39c77 100644
@Override
public void onServiceDisconnected(ComponentName name) {
// Do nothing
@@ -2028,6 +2033,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
@@ -2014,6 +2019,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
mContext.unbindService(this);
}

4
Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/0002-Random_MAC.patch
View File

@ -69,10 +69,10 @@ index fce5758e1..817fb2958 100644
}
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index 98d2cb31a..3830ee286 100644
index 4d484adfb..ede8833b6 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -247,7 +247,7 @@ public class WifiConfigurationUtil {
@@ -248,7 +248,7 @@ public class WifiConfigurationUtil {
public static boolean hasMacRandomizationSettingsChanged(WifiConfiguration existingConfig,
WifiConfiguration newConfig) {
if (existingConfig == null) {

13
Patches/LineageOS-17.1/android_frameworks_opt_net_wifi/410992.patch
View File

@ -1,8 +1,7 @@
From bc5e1e951c11a53149083c1b8a2dcc330c9a091d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nate Jiang <qiangjiang@google.com>
Date: Thu, 8 Aug 2024 18:13:39 +0000
Subject: [PATCH] [BACKPORT] Fix security issue by change the field in
WifiConfig
Subject: [PATCH] Fix security issue by change the field in WifiConfig
Flag: EXEMPT bugfix
Bug: 347912017
@ -18,7 +17,7 @@ Change-Id: I8998340ae557660036895dd906808d682b83c6f0
1 file changed, 72 insertions(+), 1 deletion(-)
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index b8992a0119..4d484adfb6 100644
index b8992a011..4d484adfb 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -82,6 +82,12 @@ public class WifiConfigurationUtil {
@ -34,7 +33,7 @@ index b8992a0119..4d484adfb6 100644
@VisibleForTesting
public static final String PASSWORD_MASK = "*";
private static final String MATCH_EMPTY_SSID_PATTERN_PATH = "";
@@ -688,7 +694,8 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) {
@@ -688,7 +694,8 @@ public class WifiConfigurationUtil {
if (!validateSsid(config.SSID, isAdd)) {
return false;
}
@ -44,7 +43,7 @@ index b8992a0119..4d484adfb6 100644
return false;
}
if (!validateBitSets(config)) {
@@ -697,6 +704,12 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) {
@@ -697,6 +704,12 @@ public class WifiConfigurationUtil {
if (!validateKeyMgmt(config.allowedKeyManagement)) {
return false;
}
@ -57,7 +56,7 @@ index b8992a0119..4d484adfb6 100644
if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK)
&& !validatePassword(config.preSharedKey, isAdd, false)) {
return false;
@@ -732,6 +745,64 @@ public static boolean validate(WifiConfiguration config, boolean isAdd) {
@@ -732,6 +745,64 @@ public class WifiConfigurationUtil {
return true;
}

2
Patches/LineageOS-17.1/android_libcore/408527.patch
View File

@ -1,4 +1,4 @@
From abc51025abe483fa071a2e1a20db46341e59012b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Almaz Mingaleev <mingaleev@google.com>
Date: Wed, 10 Jul 2024 13:38:35 +0100
Subject: [PATCH] Do not accept zip files with invalid headers.

6
Patches/LineageOS-17.1/android_packages_apps_Bluetooth/408528.patch
View File

@ -1,4 +1,4 @@
From f9b4d83aff0d3dac5d73676b251fd1e14c5bf682 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Mon, 8 Apr 2024 19:44:45 +0000
Subject: [PATCH] BACKPORT: RESTRICT AUTOMERGE Disallow unexpected incoming HID
@ -61,7 +61,7 @@ diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android
index c378f8e89..d49edfa7a 100644
--- a/src/com/android/bluetooth/hid/HidHostService.java
+++ b/src/com/android/bluetooth/hid/HidHostService.java
@@ -157,7 +157,10 @@ public void handleMessage(Message msg) {
@@ -157,7 +157,10 @@ public class HidHostService extends ProfileService {
break;
case MESSAGE_DISCONNECT: {
BluetoothDevice device = (BluetoothDevice) msg.obj;
@ -73,7 +73,7 @@ index c378f8e89..d49edfa7a 100644
broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTING);
broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED);
break;
@@ -871,7 +874,7 @@ public void dump(StringBuilder sb) {
@@ -871,7 +874,7 @@ public class HidHostService extends ProfileService {
private native boolean connectHidNative(byte[] btAddress);

6
Patches/LineageOS-17.1/android_packages_apps_Settings/408529.patch
View File

@ -1,4 +1,4 @@
From 9702e2c9683d87d5bae2009d30bd13df12ae9dd6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yiling Chuang <emilychuang@google.com>
Date: Mon, 8 Jul 2024 03:09:50 +0000
Subject: [PATCH] RESTRICT AUTOMERGE FRP bypass defense in App battery usage
@ -24,7 +24,7 @@ diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/
index e8d5f3330f2..d17642053e7 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -210,6 +210,11 @@ public void onResume() {
@@ -210,6 +210,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
initPreference();
}
@ -40,7 +40,7 @@ diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsa
index 8eeac8d26b0..37fa511beeb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -395,4 +395,9 @@ public void testInitPreference_hasCorrectSummary() {
@@ -395,4 +395,9 @@ public class AdvancedPowerUsageDetailTest {
assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min");
assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min");
}

8
Patches/LineageOS-17.1/android_packages_apps_Settings/410993.patch
View File

@ -1,7 +1,7 @@
From 38f463ffa95d46bb7a56caefe12f7ed96adbf856 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anna Bauza <annabauza@google.com>
Date: Thu, 14 Nov 2024 18:58:26 +0100
Subject: [PATCH] [PATCH] fix: Security Report - Reveal images across users via
Subject: [PATCH] fix: Security Report - Reveal images across users via
EditUserPhotoController
This functionality has implemented tests on t+ branches.
@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/c
index f1831f7120b..d836d2687bc 100644
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ b/src/com/android/settings/users/EditUserPhotoController.java
@@ -18,6 +18,7 @@
@@ -18,6 +18,7 @@ package com.android.settings.users;
import android.app.Activity;
import android.content.ClipData;
@ -27,7 +27,7 @@ index f1831f7120b..d836d2687bc 100644
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -131,6 +132,12 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -131,6 +132,12 @@ public class EditUserPhotoController {
return false;
}

4
Patches/LineageOS-17.1/android_packages_apps_Settings/410994.patch
View File

@ -1,4 +1,4 @@
From dc193083cea24f184921fbdd46383332f7b26d5a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Mon, 22 Jul 2024 17:03:12 -0700
Subject: [PATCH] startActivityForResult with new Intent
@ -22,7 +22,7 @@ diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/c
index 7cf46b69245..3f06e870a02 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -649,7 +649,7 @@ public void onReceive(Context context, Intent intent) {
@@ -649,7 +649,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult(

10
Patches/LineageOS-17.1/android_packages_apps_Settings/410995.patch
View File

@ -1,4 +1,4 @@
From 99e4f13fcff7a6659d4575c904f3102aa7b4d9e3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fan Wu <cechkahn@google.com>
Date: Mon, 22 Jul 2024 16:12:46 +0800
Subject: [PATCH] RESTRICT AUTOMERGE Checks cross user permission before
@ -21,7 +21,7 @@ diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/an
index 71043400ff8..9d098000fbc 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -18,7 +18,9 @@
@@ -18,7 +18,9 @@ package com.android.settings.applications;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@ -31,7 +31,7 @@ index 71043400ff8..9d098000fbc 100644
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
@@ -38,6 +40,7 @@
@@ -38,6 +40,7 @@ import android.os.UserManager;
import android.text.TextUtils;
import android.util.Log;
@ -39,7 +39,7 @@ index 71043400ff8..9d098000fbc 100644
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
@@ -134,8 +137,13 @@ protected String retrieveAppEntry() {
@@ -134,8 +137,13 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
}
}
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
@ -55,7 +55,7 @@ index 71043400ff8..9d098000fbc 100644
} else {
mUserId = UserHandle.myUserId();
}
@@ -158,6 +166,32 @@ protected String retrieveAppEntry() {
@@ -158,6 +166,32 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
return mPackageName;
}

4
Patches/LineageOS-17.1/android_packages_providers_MediaProvider/410996.patch
View File

@ -1,4 +1,4 @@
From 4a76c7fef797ae930db774cea0df8fecd6742a56 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Omar Eissa <oeissa@google.com>
Date: Tue, 27 Aug 2024 13:24:21 +0000
Subject: [PATCH] Prevent apps from renaming files they don't own
@ -28,7 +28,7 @@ diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/androi
index 4cd4452d0..6e15836ce 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4713,6 +4713,8 @@ && getCallingPackageTargetSdkVersion() <= Build.VERSION_CODES.Q) {
@@ -4713,6 +4713,8 @@ public class MediaProvider extends ContentProvider {
case VIDEO_MEDIA_ID:
case IMAGES_MEDIA_ID:
case DOWNLOADS_ID:

4
Patches/LineageOS-17.1/android_system_bt/408530.patch
View File

@ -1,4 +1,4 @@
From ea63021fbc4a92554c11fc07f1ca7282b41e6641 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sun, 29 Nov 2020 17:05:05 -0800
Subject: [PATCH] Add privatize option for bluetooth addresses for logging
@ -17,7 +17,7 @@ Change-Id: Id568adb9f9497072a79100202501c4d207e40828
diff --git a/main/shim/dumpsys.h b/main/shim/dumpsys.h
new file mode 100644
index 00000000000..0dc0bc2fd94
index 000000000..0dc0bc2fd
--- /dev/null
+++ b/main/shim/dumpsys.h
@@ -0,0 +1,26 @@

4
Patches/LineageOS-17.1/android_system_bt/408531.patch
View File

@ -1,4 +1,4 @@
From b3e6c7b50e9df35dec9b5a00e6d9dccd51f9ebb2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sun, 14 Mar 2021 09:52:19 -0700
Subject: [PATCH] Add btif/include/btif_hh::btif_hh_status_text
@ -16,7 +16,7 @@ Change-Id: Iab6a4f33a3e498c33f4870abc5abd59e073d03f2
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
index b71d347c1a7..f33598d2f19 100644
index b71d347c1..f33598d2f 100644
--- a/btif/include/btif_hh.h
+++ b/btif/include/btif_hh.h
@@ -46,7 +46,7 @@

14
Patches/LineageOS-17.1/android_system_bt/408532.patch
View File

@ -1,7 +1,7 @@
From 26c752cae91c2483bdbc16c49d5f62dffb4a784a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Mon, 8 Apr 2024 19:42:21 +0000
Subject: [PATCH] [BACKPORT] Disallow unexpected incoming HID connections 1/2
Subject: [PATCH] Disallow unexpected incoming HID connections 1/2
HID profile accepted any new incoming HID connection. Even when the
connection policy disabled HID connection, remote devices could initiate
@ -27,7 +27,7 @@ Change-Id: I6e9db983e752dd498625078c13b736cd4c668806
5 files changed, 161 insertions(+), 8 deletions(-)
diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
index f33598d2f19..f93341d89f1 100644
index f33598d2f..f93341d89 100644
--- a/btif/include/btif_hh.h
+++ b/btif/include/btif_hh.h
@@ -97,6 +97,7 @@ typedef struct {
@ -49,7 +49,7 @@ index f33598d2f19..f93341d89f1 100644
extern void btif_hh_disconnect(RawAddress* bd_addr);
extern void btif_hh_setreport(btif_hh_device_t* p_dev,
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
index 1c1163d1428..362ffdc21bb 100644
index 1c1163d14..362ffdc21 100644
--- a/btif/include/btif_storage.h
+++ b/btif/include/btif_storage.h
@@ -178,6 +178,29 @@ bt_status_t btif_storage_remove_bonded_device(const RawAddress* remote_bd_addr);
@ -83,7 +83,7 @@ index 1c1163d1428..362ffdc21bb 100644
*
* Function btif_storage_add_hid_device_info
diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
index 5c57ee80c7a..50ea2d4e386 100644
index 5c57ee80c..50ea2d4e3 100644
--- a/btif/src/btif_hh.cc
+++ b/btif/src/btif_hh.cc
@@ -42,6 +42,7 @@
@ -269,7 +269,7 @@ index 5c57ee80c7a..50ea2d4e386 100644
osi_free_and_reset((void**)&dscp_info.descriptor.dsc_list);
diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index 200ea2c4e42..ecbf2b50aea 100644
index 200ea2c4e..ecbf2b50a 100644
--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -89,6 +89,8 @@ using bluetooth::Uuid;
@ -355,7 +355,7 @@ index 200ea2c4e42..ecbf2b50aea 100644
return BT_STATUS_SUCCESS;
}
diff --git a/include/hardware/bt_hh.h b/include/hardware/bt_hh.h
index b87b129bb12..923c6279216 100644
index b87b129bb..923c62792 100644
--- a/include/hardware/bt_hh.h
+++ b/include/hardware/bt_hh.h
@@ -154,7 +154,7 @@ typedef struct {

7
Patches/LineageOS-17.1/android_system_bt/411488.patch
View File

@ -1,8 +1,7 @@
From 9f73a10e0bd1ac2f6d8e3fe612fb9ff2f1839d63 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 8 Jul 2024 22:42:18 +0000
Subject: [PATCH] [BACKPORT] Fix OOB write in build_read_multi_rsp of
gatt_sr.cc
Subject: [PATCH] Fix OOB write in build_read_multi_rsp of gatt_sr.cc
build_read_multi_rsp is missing a bounds check, which can lead to an
OOB write when the mtu parameter is set to zero.
@ -24,7 +23,7 @@ Change-Id: Icc8209aec68873c9821a36c579cd5df05c6ec8b8
1 file changed, 8 insertions(+)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 252732c739..9a875d742d 100644
index 558d61fcc..87e8e82da 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -136,6 +136,14 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,

6
Patches/LineageOS-17.1/android_system_bt/411489.patch
View File

@ -1,7 +1,7 @@
From 25e48c2d290d3be724df2e7e073b661331963752 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hui Peng <phui@google.com>
Date: Thu, 27 Jul 2023 04:09:04 +0000
Subject: [PATCH] [BACKPORT] Fix an integer underflow in build_read_multi_rsp
Subject: [PATCH] Fix an integer underflow in build_read_multi_rsp
This is a backport of Ia60dd829ff9152c083de1f4c1265bb3ad595dcc4
to sc-dev
@ -18,7 +18,7 @@ Change-Id: Ia60dd829ff9152c083de1f4c1265bb3ad595dcc4
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 9a875d742d..c0c1486af0 100644
index 87e8e82da..656a640b8 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -21,7 +21,7 @@

6
Patches/LineageOS-17.1/android_system_bt/411490.patch
View File

@ -1,7 +1,7 @@
From 425cc51af8d1662dacab60330628a6adfd1a404f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Paw=C5=82owski?= <jpawlowski@google.com>
Date: Thu, 1 Aug 2024 14:12:58 +0000
Subject: [PATCH] [BACKPORT] Fix "GATT Read Multiple Variable Response" builder
Subject: [PATCH] Fix "GATT Read Multiple Variable Response" builder
0 length value is perfectly fine, and should result in just length
added into the packet.
@ -23,7 +23,7 @@ Change-Id: Ida4f6b566cf9fa40fc5330d8084c29669ccaa608
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index c0c1486af0..d94221682d 100644
index 656a640b8..ed654a5cc 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -180,7 +180,7 @@ static bool process_read_multi_rsp(tGATT_SR_CMD* p_cmd, tGATT_STATUS status,

8
Patches/LineageOS-17.1/android_vendor_qcom_opensource_packages_apps_Bluetooth/408533.patch
View File

@ -1,4 +1,4 @@
From 6365a211cfc7a25ba9bcd9fbb65a5becc8fa17cf Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Mon, 8 Apr 2024 19:44:45 +0000
Subject: [PATCH] BACKPORT: RESTRICT AUTOMERGE Disallow unexpected incoming HID
@ -62,7 +62,7 @@ diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android
index bbde61948..63f0bc9a9 100644
--- a/src/com/android/bluetooth/hid/HidHostService.java
+++ b/src/com/android/bluetooth/hid/HidHostService.java
@@ -156,7 +156,10 @@ public void handleMessage(Message msg) {
@@ -156,7 +156,10 @@ public class HidHostService extends ProfileService {
break;
case MESSAGE_DISCONNECT: {
BluetoothDevice device = (BluetoothDevice) msg.obj;
@ -74,7 +74,7 @@ index bbde61948..63f0bc9a9 100644
broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTING);
broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED);
break;
@@ -181,7 +184,10 @@ public void handleMessage(Message msg) {
@@ -181,7 +184,10 @@ public class HidHostService extends ProfileService {
Log.d(TAG, "Incoming HID connection rejected");
}
if (disconnectRemote(device)) {
@ -86,7 +86,7 @@ index bbde61948..63f0bc9a9 100644
} else {
virtualUnPlugNative(Utils.getByteAddress(device));
}
@@ -906,7 +912,7 @@ public void dump(StringBuilder sb) {
@@ -906,7 +912,7 @@ public class HidHostService extends ProfileService {
private native boolean connectHidNative(byte[] btAddress);

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/408534.patch
View File

@ -1,4 +1,4 @@
From 41e0ee3735cdd68949edbedf5ff4fd16f8496b73 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sun, 29 Nov 2020 17:05:05 -0800
Subject: [PATCH] Add privatize option for bluetooth addresses for logging

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/408535.patch
View File

@ -1,4 +1,4 @@
From 322c9005d55c5648cd1e6a2cfd25e45d6da73562 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sun, 14 Mar 2021 09:52:19 -0700
Subject: [PATCH] Add btif/include/btif_hh::btif_hh_status_text

12
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/408536.patch
View File

@ -1,4 +1,4 @@
From 70750edace71473e69cca83023972066e8233d2e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Mon, 8 Apr 2024 19:42:21 +0000
Subject: [PATCH] RESTRICT AUTOMERGE Disallow unexpected incoming HID
@ -29,7 +29,7 @@ Change-Id: I6e9db983e752dd498625078c13b736cd4c668806
5 files changed, 160 insertions(+), 8 deletions(-)
diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
index 98dc33383d..2aa03fddc9 100644
index 98dc33383..2aa03fddc 100644
--- a/btif/include/btif_hh.h
+++ b/btif/include/btif_hh.h
@@ -113,6 +113,7 @@ typedef struct {
@ -51,7 +51,7 @@ index 98dc33383d..2aa03fddc9 100644
extern void btif_hh_disconnect(RawAddress* bd_addr);
extern void btif_hh_service_registration(bool enable);
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
index b1ada4db61..a32b7b8ffc 100755
index b1ada4db6..a32b7b8ff 100755
--- a/btif/include/btif_storage.h
+++ b/btif/include/btif_storage.h
@@ -201,6 +201,29 @@ bt_status_t btif_storage_is_device_bonded(RawAddress *remote_bd_addr);
@ -85,7 +85,7 @@ index b1ada4db61..a32b7b8ffc 100755
*
* Function btif_storage_add_hid_device_info
diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
index b5135ff2fe..0d184a6465 100644
index b5135ff2f..0d184a646 100644
--- a/btif/src/btif_hh.cc
+++ b/btif/src/btif_hh.cc
@@ -340,6 +340,24 @@ btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle) {
@ -263,7 +263,7 @@ index b5135ff2fe..0d184a6465 100644
osi_free_and_reset((void**)&dscp_info.descriptor.dsc_list);
diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index a62d9da6d3..db2091d9cf 100644
index a62d9da6d..db2091d9c 100644
--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -91,6 +91,8 @@ using bluetooth::Uuid;
@ -349,7 +349,7 @@ index a62d9da6d3..db2091d9cf 100644
return BT_STATUS_SUCCESS;
}
diff --git a/include/hardware/bt_hh.h b/include/hardware/bt_hh.h
index c39e3e5b8a..c1247cb1c7 100644
index c39e3e5b8..c1247cb1c 100644
--- a/include/hardware/bt_hh.h
+++ b/include/hardware/bt_hh.h
@@ -151,7 +151,7 @@ typedef struct {

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/411491.patch
View File

@ -1,4 +1,4 @@
From aff29339e466060263340cee43e16fbfc767d57f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brian Delwiche <delwiche@google.com>
Date: Mon, 8 Jul 2024 22:42:18 +0000
Subject: [PATCH] Fix OOB write in build_read_multi_rsp of gatt_sr.cc

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/411492.patch
View File

@ -1,4 +1,4 @@
From e0b5d40517e5f89c1570fa9726835e3fbce89e56 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hui Peng <phui@google.com>
Date: Thu, 27 Jul 2023 04:09:04 +0000
Subject: [PATCH] Fix an integer underflow in build_read_multi_rsp

2
Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/411493.patch
View File

@ -1,4 +1,4 @@
From 2f3d8b20b8211999d7758c7bb0e868fe46eea540 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Paw=C5=82owski?= <jpawlowski@google.com>
Date: Thu, 1 Aug 2024 14:12:58 +0000
Subject: [PATCH] Fix "GATT Read Multiple Variable Response" builder

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

@ -697,9 +697,9 @@ applyPatch "$DOS_PATCHES/android_system_bt/397596.patch"; #P_asb_2024-07 Fix an
applyPatch "$DOS_PATCHES/android_system_bt/399772.patch"; #P_asb_2024-08 Fix heap-buffer overflow in sdp_utils.cc
applyPatch "$DOS_PATCHES/android_system_bt/405833.patch"; #P_asb_2024-10 Add btif/include/btif_hh::btif_hh_status_text
applyPatch "$DOS_PATCHES/android_system_bt/405834.patch"; #P_asb_2024-10 Disallow unexpected incoming HID connections 1/2
+applyPatch "$DOS_PATCHES/android_system_bt/411488.patch"; #R_asb_2024-12 Fix OOB write in build_read_multi_rsp of gatt_sr.cc
+applyPatch "$DOS_PATCHES/android_system_bt/411489-backport.patch"; #R_asb_2024-12 Fix an integer underflow in build_read_multi_rsp
+applyPatch "$DOS_PATCHES/android_system_bt/411490.patch"; #R_asb_2024-12 Fix "GATT Read Multiple Variable Response" builder
applyPatch "$DOS_PATCHES/android_system_bt/411488.patch"; #R_asb_2024-12 Fix OOB write in build_read_multi_rsp of gatt_sr.cc
applyPatch "$DOS_PATCHES/android_system_bt/411489-backport.patch"; #R_asb_2024-12 Fix an integer underflow in build_read_multi_rsp
applyPatch "$DOS_PATCHES/android_system_bt/411490.patch"; #R_asb_2024-12 Fix "GATT Read Multiple Variable Response" builder
#applyPatch "$DOS_PATCHES_COMMON/android_system_bt/0001-alloc_size.patch"; #Add alloc_size attributes to the allocator (GrapheneOS)
fi;

2
Scripts/LineageOS-17.1/Patch.sh
View File

@ -825,7 +825,7 @@ applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/403324.patch";
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/403325.patch"; #Q_asb_2024-09 Add support for checking security downgrade
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/403326.patch"; #Q_asb_2024-09 Disallow connect with Secure Connections downgrade
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/403327.patch"; #Q_asb_2024-09 Disallow connect with key length downgrade
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/408535.patch"; #Q_asb_2024-10 Add privatize option for bluetooth addresses for logging
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/408534.patch"; #Q_asb_2024-10 Add privatize option for bluetooth addresses for logging
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/408535.patch"; #Q_asb_2024-10 Add btif/include/btif_hh::btif_hh_status_text
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/408536.patch"; #Q_asb_2024-10 Disallow unexpected incoming HID connections 1/2
applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_system_bt/411491.patch"; #R_asb_2024-12 Fix OOB write in build_read_multi_rsp of gatt_sr.cc