-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: sync with latest sources of TrebleDroid
- Loading branch information
1 parent
d8f04f7
commit 5d111a7
Showing
12 changed files
with
56 additions
and
87 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...oid/platform_packages_modules_Bluetooth/0001-gd-hci-Ignore-unexpected-status-events.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 22287de067e953b68487c252a207be25f7f4a836 Mon Sep 17 00:00:00 2001 | ||
From 4e62d6ac83cd28aedfd972dce079a02712c69998 Mon Sep 17 00:00:00 2001 | ||
From: Peter Cai <[email protected]> | ||
Date: Wed, 24 Aug 2022 10:41:29 -0400 | ||
Subject: [PATCH 1/9] gd: hci: Ignore unexpected status events | ||
|
2 changes: 1 addition & 1 deletion
2
...tform_packages_modules_Bluetooth/0002-audio_hal_interface-Optionally-use-sysbta-HAL.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 5a28bc1990c42f52ecf62ccafb7bed354553bf40 Mon Sep 17 00:00:00 2001 | ||
From 6bfd00e4974ce4c626b53e83dc93141fe4d5005c Mon Sep 17 00:00:00 2001 | ||
From: Peter Cai <[email protected]> | ||
Date: Wed, 24 Aug 2022 15:45:18 -0400 | ||
Subject: [PATCH 2/9] audio_hal_interface: Optionally use sysbta HAL | ||
|
2 changes: 1 addition & 1 deletion
2
...tform_packages_modules_Bluetooth/0003-Add-option-to-change-eSCO-Transport-Unit-Size.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 010c5473c6add244fdb3571d44ab09c74969ab6b Mon Sep 17 00:00:00 2001 | ||
From 70f5cfdbb9d0bc5a3db7bf325e469d78a748a080 Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Thu, 17 Jun 2021 15:48:53 +0100 | ||
Subject: [PATCH 3/9] Add option to change eSCO Transport Unit Size | ||
|
2 changes: 1 addition & 1 deletion
2
..._packages_modules_Bluetooth/0004-Don-t-abort-when-failing-to-get-real-time-priority.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From f95050537b44e883d7a0169914d3a1aaeba7a7e5 Mon Sep 17 00:00:00 2001 | ||
From 4b9b45609a13877320c1f943cd1f1839bf66ed73 Mon Sep 17 00:00:00 2001 | ||
From: Pierre-Hugues Husson <[email protected]> | ||
Date: Sun, 17 Oct 2021 17:17:13 -0400 | ||
Subject: [PATCH 4/9] Don't abort when failing to get real-time priority | ||
|
2 changes: 1 addition & 1 deletion
2
...ackages_modules_Bluetooth/0005-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 42d93b0cb17728e95d77742e78623cf9b6542636 Mon Sep 17 00:00:00 2001 | ||
From f955f5badd7d8e418eb873ba990f346b3c2606f5 Mon Sep 17 00:00:00 2001 | ||
From: Andreas Schneider <[email protected]> | ||
Date: Sat, 12 Nov 2022 00:35:46 +0000 | ||
Subject: [PATCH 5/9] On Samsung devices, we need to tell Audio HAL if we're | ||
|
2 changes: 1 addition & 1 deletion
2
...ackages_modules_Bluetooth/0006-Add-properties-to-disable-some-features-commands-sta.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4d83f020d76fbbd20c7a109b3b182672114a8bd2 Mon Sep 17 00:00:00 2001 | ||
From a88d76dfc38245be6b72065c2a8305e7e590582f Mon Sep 17 00:00:00 2001 | ||
From: Pierre-Hugues Husson <[email protected]> | ||
Date: Sat, 27 May 2023 06:41:32 -0400 | ||
Subject: [PATCH 6/9] Add properties to disable some features/commands/states | ||
|
2 changes: 1 addition & 1 deletion
2
...ackages_modules_Bluetooth/0007-Add-a-property-to-cap-declared-le-vendor-version.-Fo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6797a5f3c3f662673f5c3ba3b30915bbff628cfc Mon Sep 17 00:00:00 2001 | ||
From 26910600dd6a736416d43c18fa87b5be1b2d66eb Mon Sep 17 00:00:00 2001 | ||
From: Pierre-Hugues Husson <[email protected]> | ||
Date: Tue, 30 May 2023 17:34:03 -0400 | ||
Subject: [PATCH 7/9] Add a property to cap declared le vendor version. Found | ||
|
2 changes: 1 addition & 1 deletion
2
...ackages_modules_Bluetooth/0008-gd-hci-Ignore-command-READ_REMOTE_VERSION_INFORMATIO.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From dfb405cc2f3510ee35a7097432847d5440620384 Mon Sep 17 00:00:00 2001 | ||
From 4d8f39572d57bdb602153e75a28810565282ce73 Mon Sep 17 00:00:00 2001 | ||
From: wbs306 <[email protected]> | ||
Date: Fri, 20 Jan 2023 17:07:41 +0800 | ||
Subject: [PATCH 8/9] gd: hci: Ignore command READ_REMOTE_VERSION_INFORMATION | ||
|
32 changes: 0 additions & 32 deletions
32
...ackages_modules_Bluetooth/0009-Don-t-crash-on-status-UNSUPPORTED_REMOTE_OR_LMP_FEAT.patch
This file was deleted.
Oops, something went wrong.
41 changes: 41 additions & 0 deletions
41
...atform_packages_modules_Bluetooth/0009-fixup-gd-hci-Ignore-unexpected-status-events.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From 9110c9e2cdb4ff4a9ab61bfdeeccba00c508f3ed Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Mon, 18 Nov 2024 15:32:49 +0000 | ||
Subject: [PATCH 9/9] fixup! gd: hci: Ignore unexpected status events | ||
|
||
--- | ||
system/gd/hci/hci_layer.cc | 11 ++--------- | ||
1 file changed, 2 insertions(+), 9 deletions(-) | ||
|
||
diff --git a/system/gd/hci/hci_layer.cc b/system/gd/hci/hci_layer.cc | ||
index 803ab382b1..eb4f25cf24 100644 | ||
--- a/system/gd/hci/hci_layer.cc | ||
+++ b/system/gd/hci/hci_layer.cc | ||
@@ -209,8 +209,7 @@ struct HciLayer::impl { | ||
|
||
bool is_vendor_specific = static_cast<int>(op_code) & (0x3f << 10); | ||
CommandStatusView status_view = CommandStatusView::Create(event); | ||
- if (is_vendor_specific && (is_status && !command_queue_.front().waiting_for_status_) && | ||
- (status_view.IsValid() && status_view.GetStatus() == ErrorCode::UNKNOWN_HCI_COMMAND)) { | ||
+ if (command_queue_.front().waiting_for_status_ != is_status) { | ||
// If this is a command status of a vendor specific command, and command complete is expected, | ||
// we can't treat this as hard failure since we have no way of probing this lack of support at | ||
// earlier time. Instead we let the command complete handler handle a empty Command Complete | ||
@@ -230,13 +229,7 @@ struct HciLayer::impl { | ||
command_complete_view.IsValid(), "assert failed: command_complete_view.IsValid()"); | ||
(*command_queue_.front().GetCallback<CommandCompleteView>())(command_complete_view); | ||
} else { | ||
- if (command_queue_.front().waiting_for_status_ == is_status) { | ||
- (*command_queue_.front().GetCallback<TResponse>())(std::move(response_view)); | ||
- } else { | ||
- CommandCompleteView command_complete_view = CommandCompleteView::Create( | ||
- EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>())))); | ||
- (*command_queue_.front().GetCallback<CommandCompleteView>())(std::move(command_complete_view)); | ||
- } | ||
+ (*command_queue_.front().GetCallback<TResponse>())(std::move(response_view)); | ||
} | ||
|
||
#ifdef TARGET_FLOSS | ||
-- | ||
2.34.1 | ||
|
14 changes: 7 additions & 7 deletions
14
...kages_modules_DnsResolver/0001-Dont-abort-if-the-DnsHelper-failed-to-init-on-BPF-le.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
From 231447df3b3c36e45410bbcf7f79aca05c69cfbe Mon Sep 17 00:00:00 2001 | ||
From 4cdbe177c39d9540aa1b91e55cc21ef0100504f0 Mon Sep 17 00:00:00 2001 | ||
From: Pierre-Hugues Husson <[email protected]> | ||
Date: Tue, 7 May 2024 22:44:25 +0000 | ||
Subject: [PATCH 1/2] Dont abort if the DnsHelper failed to init on BPF-less | ||
kernel | ||
Subject: [PATCH] Dont abort if the DnsHelper failed to init on BPF-less kernel | ||
|
||
--- | ||
DnsProxyListener.cpp | 1 - | ||
1 file changed, 1 deletion(-) | ||
DnsProxyListener.cpp | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/DnsProxyListener.cpp b/DnsProxyListener.cpp | ||
index 04c59212..3d260966 100644 | ||
index 04c59212..b881a68e 100644 | ||
--- a/DnsProxyListener.cpp | ||
+++ b/DnsProxyListener.cpp | ||
@@ -691,7 +691,6 @@ IsUidBlockedFn resolveIsUidNetworkingBlockedFn() { | ||
@@ -691,7 +691,7 @@ IsUidBlockedFn resolveIsUidNetworkingBlockedFn() { | ||
const int ret = (*ADnsHelper_init)(); | ||
if (ret) { | ||
LOG(ERROR) << __func__ << ": ADnsHelper_init failed " << strerror(-ret); | ||
- abort(); | ||
+ return nullptr; | ||
} | ||
|
||
IsUidBlockedFn f = | ||
|
40 changes: 0 additions & 40 deletions
40
...tform_packages_modules_DnsResolver/0002-If-ADnsHelper_init-failed-let-s-never-block.patch
This file was deleted.
Oops, something went wrong.