OSDN Git Service
Mauro Rossi [Thu, 26 Dec 2019 20:52:57 +0000 (21:52 +0100)]
hci_packetizer: fix unused building errors
Fixes the following building errors:
system/bt/vendor_libs/linux/interface/hci_packetizer.cc:28:14:
error: unused variable 'preamble_size_for_type' [-Werror,-Wunused-const-variable]
const size_t preamble_size_for_type[] = {
^
system/bt/vendor_libs/linux/interface/hci_packetizer.cc:35:8:
error: unused function 'HciGetPacketLengthForType' [-Werror,-Wunused-function]
size_t HciGetPacketLengthForType(HciPacketType type, const uint8_t* preamble) {
^
2 errors generated.
Gaganpreet kaur [Wed, 24 Apr 2019 11:09:07 +0000 (16:39 +0530)]
Fix for multiple com.android.bluetooth crash issues.
Issue 1: com.android.bluetooth crash was seen due to invalid/
out of bound index while creating Listening Channel for AVRCP.
Reason: AVRCP creates the listening channel using
bta_av_rc_create, this function expects RC Channel Handle to be
passed as it will fetch the index for RC handle using
tBTA_AV_SCB* p_scb = p_cb->p_scb[shdl - 1];
But we are passing 0 i.e. index for RC handle directly. Due to
which above statement will throw exception for out of bound
index and crash is observed.
Fix: Updated the bta_av_rc_create calls with RC handle value
instead of index.
Issue 2: com.android.bluetooth crash was seen due to failed
check for parameter length for vendor capabilities as:
CHECK(p_vcs_cplt_params->param_len >
BTM_VSC_CHIP_CAPABILITY_RSP_LEN)
Reason: We always receive param_len for vendor capabilities as
9. Also BTM_VSC_CHIP_CAPABILITY_RSP_LEN is defined as 9. But as
per the check param_len is expected to be greater than 9. As the
check fails, exception is seen and crash is observed.
Fix: Changed the CHECK on param_len for Vendor Capabilities as:
CHECK(p_vcs_cplt_params->param_len >=
BTM_VSC_CHIP_CAPABILITY_RSP_LEN)
Change-Id: Ic11c58e8193c0d8252e569fee2bc99d30abb7aae
Tracked-On:
Signed-off-by: Gaganpreet kaur <gaganpreetx.kaur@intel.com>
Chih-Wei Huang [Tue, 12 Jun 2018 06:32:03 +0000 (14:32 +0800)]
Avoid annoying crashing on VMware
Chih-Wei Huang [Sun, 10 Jun 2018 09:46:25 +0000 (17:46 +0800)]
Remove the unused function
Chih-Wei Huang [Wed, 6 Dec 2017 09:57:21 +0000 (17:57 +0800)]
HCI: don't abort on timeout
Timeout is normal. Especially when the device is suspending.
Don't abort it stupidly.
Android Build Coastguard Worker [Tue, 15 Mar 2022 18:17:52 +0000 (18:17 +0000)]
Merge cherrypicks of [
16816453] into sc-v2-release.
Change-Id: I9a0ba25922932a9b49cf4b8d30b930bb9a122f19
Chienyuan Huang [Wed, 9 Feb 2022 06:38:48 +0000 (06:38 +0000)]
Fix OOB of L2CAP_CMD_CREDIT_BASED_CONN_RES
Change-Id: Ic947572e179ec4dacae9655192cadac7cf8c3ea4
TAG: #security
Bug:
213519176
Test: manual
Ignore-AOSP-First: security fix
(cherry picked from commit
ed4b512d2b3d45151b7f70e4c8c60b1a052a5d7c)
Merged-In: Ic947572e179ec4dacae9655192cadac7cf8c3ea4
Android Build Coastguard Worker [Mon, 14 Feb 2022 23:14:03 +0000 (23:14 +0000)]
Merge cherrypicks of [
16816308,
16630867] into sc-v2-release.
Change-Id: I5817aa8c870e5e8f2849644bdd966813d55960e3
Ted Wang [Thu, 13 Jan 2022 07:00:32 +0000 (15:00 +0800)]
Security fix OOB read due to invalid count in stack/avrc/avrc_pars_ct
Bug:
205837191
Tag: #security
Test: PoC test program
Ignore-AOSP-First: Security
Change-Id: I7b5bcb6551a8c0c015566327e13ba719271ce374
(cherry picked from commit
415b7d925eb9e3608f98398b6159e4fe1ba5f605)
Merged-In:I7b5bcb6551a8c0c015566327e13ba719271ce374
Chris Manton [Tue, 8 Feb 2022 01:39:06 +0000 (17:39 -0800)]
Security fix for potential OOB read in L2CAP
Bug:
212694559
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security fix
Change-Id: I6b5580a48295911f41e131e2328a3e284daeb68f
(cherry picked from commit
4775e3d04e62bf22fd2552cd271599f65fc06a3e)
Merged-In:I6b5580a48295911f41e131e2328a3e284daeb68f
Android Build Coastguard Worker [Wed, 29 Dec 2021 00:09:16 +0000 (00:09 +0000)]
Snap for
8033408 from
573fa507773820bab8dcea865b7e2d29b79d0446 to sc-v2-release
Change-Id: I116f785e781118c95c8f92236c9a1f3fd391fd5f
TreeHugger Robot [Tue, 28 Dec 2021 00:45:23 +0000 (00:45 +0000)]
Merge "Add Audi Carkit into IOP table to only use AVRCP 1.4" into sc-v2-dev
Himanshu Rawat [Tue, 28 Dec 2021 00:16:32 +0000 (00:16 +0000)]
Merge "Avoid waiting indefinitely for BT stack cleanup. If stack cleanup takes up more than 1 second, proceed with BT service process exit." into sc-v2-dev
Himanshu Rawat [Tue, 28 Dec 2021 00:15:57 +0000 (00:15 +0000)]
Merge "Reduced the delay after ACL disconnections during BT disable procedure." into sc-v2-dev
Android Build Coastguard Worker [Thu, 23 Dec 2021 00:09:42 +0000 (00:09 +0000)]
Snap for
8022168 from
1d577b301b218ef762c53d70ea1502af378e6beb to sc-v2-release
Change-Id: I19210241726178c27bb37f9c2d41afb3121c96cb
Ted Wang [Wed, 22 Dec 2021 05:27:18 +0000 (05:27 +0000)]
[automerger skipped] Merge "Do not cleanup offload related flag in bta_av_conn_cback" into sc-qpr1-dev am:
6b621792d5 -s ours
am skip reason: Merged-In I6a54ce2285b1ef2a5a88457a369d830d1966f300 with SHA-1
414225228f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16366977
Change-Id: Ic0b35d99ce5db11ff2135b5fe668b8211067d938
Ted Wang [Wed, 22 Dec 2021 05:09:39 +0000 (05:09 +0000)]
Merge "Do not cleanup offload related flag in bta_av_conn_cback" into sc-qpr1-dev
TreeHugger Robot [Tue, 21 Dec 2021 21:31:39 +0000 (21:31 +0000)]
Merge "AVDTP: Fix a potential OOB read at the reporting handler" into sc-v2-dev
TreeHugger Robot [Tue, 21 Dec 2021 20:15:55 +0000 (20:15 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-dev am:
fea928da40 am:
b68ba217dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16424061
Change-Id: Iff3737a5018b32f8366bde9d37750a161109ef05
TreeHugger Robot [Tue, 21 Dec 2021 20:15:39 +0000 (20:15 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-qpr1-dev am:
950a92816e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16424060
Change-Id: I9d32447de409adf6b91ed8a07d7cd3ab3b1f82e2
TreeHugger Robot [Tue, 21 Dec 2021 20:15:37 +0000 (20:15 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-dev am:
fea928da40
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16424061
Change-Id: I7a3df382b1b4643dd285c47247ab5dfd9235bd72
TreeHugger Robot [Tue, 21 Dec 2021 19:59:08 +0000 (19:59 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-v2-dev
TreeHugger Robot [Tue, 21 Dec 2021 19:58:45 +0000 (19:58 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-qpr1-dev
TreeHugger Robot [Tue, 21 Dec 2021 19:58:32 +0000 (19:58 +0000)]
Merge "Handle bogus multi value packet lengths" into sc-dev
Android Build Coastguard Worker [Sat, 18 Dec 2021 02:09:11 +0000 (02:09 +0000)]
Snap for
8012527 from
70d7e7d21603bbcab90d6ba1ab14299708811193 to sc-v2-release
Change-Id: Ieb1a81f8b5f1748d3bb6b058e195c8ca2d3c4981
Martin Brabham [Tue, 14 Dec 2021 21:07:03 +0000 (21:07 +0000)]
Revert "Clear identity bit when passing address to filter"
This reverts commit
a3eec6ddb6ae5c393f5b99398862e02ff0cb0682.
Ignore-AOSP-First: Need on sc-v2-dev; code doesn't match on master
Bug:
209885517
Test: Manual; gd/cert/run --device --clean --test_config=gd/cert/gd_sl4a_device_config.json LeAdvancedScanningTest
Tag: #stability
Change-Id: I52551649d25569397c1b1dc013eb0e6b4386fad2
More Kuo [Thu, 16 Dec 2021 07:21:05 +0000 (15:21 +0800)]
Add Audi Carkit into IOP table to only use AVRCP 1.4
Tag: #compatibility
Bug:
207828000
Test: Manual
Ignore-AOSP-First: Fixing IOP issue in an earlier release
Change-Id: I4d5b319d45d056c5073eeb485df8888f887e87f6
Martin Brabham [Wed, 15 Dec 2021 05:42:45 +0000 (05:42 +0000)]
BLE Scanning: Force the APCF address type value to always be 0x02.
The address type in...
Java:
Public = 0
Random = 1
In the host stack when dealing with BLE ID addresses 2 and 3 are used for resolve
address
C++:
Public = 0
Random = 1
Public ID = 2
Random ID = 3
The vendor command takes Public (0) or Random (1) or Any (2)
We need to use 0x02 for Any if we want to use the resolving list for scans.
e.g. specifying for a PUBLIC (0x00) will only return results for a public matching
address and will NOT try to resolve any RPA to the address. For this the Any (0x02)
must be specified.
Ignore-AOSP-First: Need on sc-v2-dev; code doesn't match on master
Bug:
209885517
Test: Manual scanning app
Tag: #stability
Change-Id: Ic4236d5703611de83c45ebe7638c0f4f2b02931b
Martin Brabham [Tue, 30 Nov 2021 18:44:27 +0000 (18:44 +0000)]
BLE Scanning: Pass original address back to GattService#onScanResult
Ignore-AOSP-First: Need for sc-v2-dev; code doesn't match on master.
Bug:
202162086
Test: Manual
Tag: #feature
Change-Id: Icc94ac06edbe7e55f77c35ef74ea06eeb95b70ea
Android Build Coastguard Worker [Wed, 15 Dec 2021 00:09:24 +0000 (00:09 +0000)]
Snap for
8000352 from
84cdf774381d51306d13d3a633e1ed893512df92 to sc-v2-release
Change-Id: I31816b313169c05fac53a7d7ece4a76b2cc2a7fb
Himanshu Rawat [Tue, 14 Dec 2021 07:26:44 +0000 (07:26 +0000)]
Avoid waiting indefinitely for BT stack cleanup. If stack cleanup takes up more than 1 second, proceed with BT service process exit.
Bug:
208971312
Test: Manual
Ignore-AOSP-First: It is in the AOSP.
Change-Id: Id573e303016dd1d5ef13764e6f1083782d3c110e
Himanshu Rawat [Tue, 14 Dec 2021 06:47:43 +0000 (06:47 +0000)]
Reduced the delay after ACL disconnections during BT disable procedure.
Bug:
208971312
Test: Manual
Ignore-AOSP-First: It is in the AOSP.
Change-Id: I431dba9a44acd51cacc5fa0b9b91aa5eb9999470
Ted Wang [Wed, 1 Dec 2021 15:28:44 +0000 (23:28 +0800)]
Do not cleanup offload related flag in bta_av_conn_cback
Do not cleanup offload related flag in bta_av_conn_cback to avoid
missing sending out offload stop command when disconnect during
streaming.
Bug:
207491735
Test: manual
Change-Id: I6a54ce2285b1ef2a5a88457a369d830d1966f300
Merged-In: I6a54ce2285b1ef2a5a88457a369d830d1966f300
TreeHugger Robot [Tue, 14 Dec 2021 01:29:33 +0000 (01:29 +0000)]
Merge "Do not cleanup offload related flag in bta_av_conn_cback" into sc-v2-dev
Android Build Coastguard Worker [Sat, 11 Dec 2021 02:08:55 +0000 (02:08 +0000)]
Snap for
7989966 from
20eb7061133f3dae931c3c66bb40f3fb70b1ce86 to sc-v2-release
Change-Id: Ib2ea7c489738571972ffc60238c81b7e53050f9b
TreeHugger Robot [Fri, 10 Dec 2021 07:43:47 +0000 (07:43 +0000)]
Merge "Merge "Disable sniff in link policy before a2dp streaming" am:
f532661162 am:
a454cdabef am:
612a2b7c4d am:
42976d77c0 am:
7feb82345e" into sc-qpr1-dev am:
3bc0ded5d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16417864
Change-Id: I23fc9fae451686480f20def5b857aa1bde6b2e9a
TreeHugger Robot [Fri, 10 Dec 2021 07:26:42 +0000 (07:26 +0000)]
Merge "Merge "Disable sniff in link policy before a2dp streaming" am:
f532661162 am:
a454cdabef am:
612a2b7c4d am:
42976d77c0 am:
7feb82345e" into sc-qpr1-dev
TreeHugger Robot [Fri, 10 Dec 2021 01:12:42 +0000 (01:12 +0000)]
Merge "Disable sniff in link policy before a2dp streaming" into sc-v2-dev
Android Build Coastguard Worker [Fri, 10 Dec 2021 00:09:56 +0000 (00:09 +0000)]
Snap for
7985315 from
b43629d34459889c834879a77ca9f4472821ba66 to sc-v2-release
Change-Id: I3cc1ff24d34f3e525f9a28cfb42c71eefa0e54d6
Treehugger Robot [Thu, 26 Aug 2021 03:11:18 +0000 (03:11 +0000)]
Disable sniff in link policy before a2dp streaming
Bug:
205672705
Ignore-AOSP-First: It is in the AOSP.
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1788388
Change-Id: I8390acacfb25fddcbd475144e399b3b0c4408a07
(cherry picked from commit
f74c025302d034f70f14d9dd85aee44b64a04f57)
Treehugger Robot [Thu, 26 Aug 2021 03:11:18 +0000 (03:11 +0000)]
Merge "Disable sniff in link policy before a2dp streaming" am:
f532661162 am:
a454cdabef am:
612a2b7c4d am:
42976d77c0 am:
7feb82345e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1788388
Bug:
205672705
Ignore-AOSP-First: It is in the AOSP.
Change-Id: I8390acacfb25fddcbd475144e399b3b0c4408a07
(cherry picked from commit
f74c025302d034f70f14d9dd85aee44b64a04f57)
TreeHugger Robot [Thu, 9 Dec 2021 01:12:26 +0000 (01:12 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
43fcfff5a3 -s ours am:
4daa7c3802 -s ours am:
2350b30bc5 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I329f93c01ca7259ef8f2175d3e76c0542c027780
TreeHugger Robot [Thu, 9 Dec 2021 00:47:17 +0000 (00:47 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
43fcfff5a3 -s ours am:
4daa7c3802 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I76debc068012dccb5b7be6876d0a32f12da4307f
TreeHugger Robot [Thu, 9 Dec 2021 00:29:56 +0000 (00:29 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
46e66f922a -s ours am:
b98e1de330 -s ours am:
429fd0e29a -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: Ia356715564d1ad80ab0dde458a29c75b2644a915
TreeHugger Robot [Thu, 9 Dec 2021 00:29:50 +0000 (00:29 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
f54099ea3b -s ours am:
8853322e88 -s ours am:
c83b7d5c54 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I67ee58e37f4d2cce905c36d44066ef87efd0044c
TreeHugger Robot [Thu, 9 Dec 2021 00:29:43 +0000 (00:29 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
e72fdba1cf -s ours am:
169ef831c6 -s ours am:
51f3790094 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I0e3daecaf00e076866a92969c40664f1aa9c7485
TreeHugger Robot [Thu, 9 Dec 2021 00:29:16 +0000 (00:29 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
43fcfff5a3 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I52fc21159f4dba527d70a36052993747fdf9e13a
TreeHugger Robot [Thu, 9 Dec 2021 00:12:08 +0000 (00:12 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
46e66f922a -s ours am:
b98e1de330 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I74c184632453eb099c5bc40397598f699acaeb92
Android Build Coastguard Worker [Thu, 9 Dec 2021 00:12:06 +0000 (00:12 +0000)]
Snap for
7981408 from
7f56f88b4cec7dd14d95d146a1b0bfa57dcc563c to sc-v2-release
Change-Id: I34159c6cb08430793b61d6aefc8d0bb2c55a1e3b
TreeHugger Robot [Thu, 9 Dec 2021 00:12:01 +0000 (00:12 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
f54099ea3b -s ours am:
8853322e88 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I1189feff33b1b64f460bceb5949fb74ab0f181cb
TreeHugger Robot [Thu, 9 Dec 2021 00:11:53 +0000 (00:11 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
e72fdba1cf -s ours am:
169ef831c6 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I196fd6cf911d359e946ff7bd0d04bf251a66a214
Chris Manton [Wed, 8 Dec 2021 02:57:48 +0000 (18:57 -0800)]
Handle bogus multi value packet lengths
Bug:
206128341
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security fix
Change-Id: I7cbb601e87259c08796731de44f2b2eaba1e2894
Chris Manton [Wed, 8 Dec 2021 02:57:48 +0000 (18:57 -0800)]
Handle bogus multi value packet lengths
Bug:
206128341
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security fix
Change-Id: I7cbb601e87259c08796731de44f2b2eaba1e2894
Chris Manton [Wed, 8 Dec 2021 02:57:48 +0000 (18:57 -0800)]
Handle bogus multi value packet lengths
Bug:
206128341
Tag: #security
Test: gd/cert/run
Ignore-AOSP-First: Security fix
Change-Id: I7cbb601e87259c08796731de44f2b2eaba1e2894
TreeHugger Robot [Thu, 9 Dec 2021 00:04:02 +0000 (00:04 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
46e66f922a -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: Ia2dfe15211eccdbb07edf19b2da959837b16bec6
TreeHugger Robot [Wed, 8 Dec 2021 23:56:04 +0000 (23:56 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 am:
e57a4afd4a -s ours am:
8a6c9a7b25 -s ours am:
2ca5169eef -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I4d49f7385ce2a8c55ff4d7965ef939f3979e8081
TreeHugger Robot [Wed, 8 Dec 2021 23:54:45 +0000 (23:54 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours am:
f54099ea3b -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I3e5dab90fb855be50ae2edc34c7f31eb85e42efb
TreeHugger Robot [Wed, 8 Dec 2021 23:54:38 +0000 (23:54 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours am:
e72fdba1cf -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I16fcf2a192da877f25f6f9e18d4308212c194fbd
TreeHugger Robot [Wed, 8 Dec 2021 23:32:26 +0000 (23:32 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 am:
e57a4afd4a -s ours am:
8a6c9a7b25 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I624246880cdfae18b7954a529e2ac3d381ae4dfa
TreeHugger Robot [Wed, 8 Dec 2021 23:32:04 +0000 (23:32 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I43c93a164f1f76f538f06495b347f18f50248002
TreeHugger Robot [Wed, 8 Dec 2021 23:31:57 +0000 (23:31 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I0babddd8b8c09e004b8667b94aa54311e200185d
TreeHugger Robot [Wed, 8 Dec 2021 23:30:29 +0000 (23:30 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours am:
262bc4d39f -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I6d606ed9c34f5a3449b2a9ad11eeebdfa089c250
TreeHugger Robot [Wed, 8 Dec 2021 23:30:24 +0000 (23:30 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours am:
e97528698f -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I1f416eab091c4c35c734959917162d10a72bd4b0
TreeHugger Robot [Wed, 8 Dec 2021 23:16:43 +0000 (23:16 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 am:
e57a4afd4a -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: If7601d7f1335bb32d0024f4fc9251d349f83e564
TreeHugger Robot [Wed, 8 Dec 2021 23:14:49 +0000 (23:14 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours am:
2ac784c2d0 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: Ie603515ac19a151e8e8ceffd9897f223573421fe
TreeHugger Robot [Wed, 8 Dec 2021 23:14:44 +0000 (23:14 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3 am:
b81193065e -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
d6d753d733 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: Iff62e07025c415477e68b179c31ba16e10b586dd
TreeHugger Robot [Wed, 8 Dec 2021 23:06:36 +0000 (23:06 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours am:
32915b2a30 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: I7d0da78bdfc6407208ccdacd1bdc817cacffc82c
TreeHugger Robot [Wed, 8 Dec 2021 23:00:52 +0000 (23:00 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 -s ours am:
e72af1fde2 -s ours am:
d311dbf8f8 -s ours am:
88b4729f59 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
0e5bb13f66 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I40d160070c9d021c3b731b1caab871505773be9b
TreeHugger Robot [Wed, 8 Dec 2021 23:00:37 +0000 (23:00 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-qpr-dev am:
c289d8f704 -s ours am:
f10b5e9d16 -s ours am:
97c0246e4b -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
ea9ce63c51 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184352
Change-Id: If1e17b3b6daed3fe357459eada5a6da10311fb4b
TreeHugger Robot [Wed, 8 Dec 2021 23:00:25 +0000 (23:00 +0000)]
Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: Ib6398e338a11e456b8f2b60b4ab633c689efcd54
TreeHugger Robot [Wed, 8 Dec 2021 23:00:17 +0000 (23:00 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into sc-dev am:
4585eddbc5 -s ours am:
a1eeb51495 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
17c29f000e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184351
Change-Id: I674aebf18d011efb4c3389025e3f366bbce316c5
TreeHugger Robot [Wed, 8 Dec 2021 23:00:12 +0000 (23:00 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 -s ours am:
e72af1fde2 -s ours am:
d311dbf8f8 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
0e5bb13f66 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I6ae832c7776cf3e7f5d804c976a759ea14dc829d
TreeHugger Robot [Wed, 8 Dec 2021 23:00:02 +0000 (23:00 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-qpr-dev am:
c289d8f704 -s ours am:
f10b5e9d16 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
ea9ce63c51 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184352
Change-Id: I255e13c3b1b52f52c6d46c66109dd28419e31860
TreeHugger Robot [Wed, 8 Dec 2021 22:59:57 +0000 (22:59 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into sc-qpr1-dev am:
f648ee5c77 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
86770f2828 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184350
Change-Id: I993b16e705aacc8654edf7a38203668e60d07f8d
TreeHugger Robot [Wed, 8 Dec 2021 22:59:50 +0000 (22:59 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into pi-dev am:
b5086a5251 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
6b3c0f6a36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232558
Change-Id: Ic7ac3b63151b055779c347031643779db9cb55c7
TreeHugger Robot [Wed, 8 Dec 2021 22:59:50 +0000 (22:59 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into sc-dev am:
4585eddbc5 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
17c29f000e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184351
Change-Id: I93135310660c629d8af5e5cb0e030783b8b14a83
TreeHugger Robot [Wed, 8 Dec 2021 22:58:49 +0000 (22:58 +0000)]
Merge "Reset the IRK after all devices are unpaired" into qt-dev am:
430c48cee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232312
Change-Id: I1c49f0eb7e2b41a7c60fa2fba1434cfa53a76fe0
TreeHugger Robot [Wed, 8 Dec 2021 22:58:43 +0000 (22:58 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 -s ours am:
e72af1fde2 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
0e5bb13f66 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I925a143e44b2483733b91ac965b216ec47ca7f66
TreeHugger Robot [Wed, 8 Dec 2021 22:58:17 +0000 (22:58 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-qpr-dev am:
c289d8f704 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
ea9ce63c51 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16184352
Change-Id: I189e1b841cbce5d840305a1ee13b10a4ebb9a709
TreeHugger Robot [Wed, 8 Dec 2021 22:58:14 +0000 (22:58 +0000)]
[automerger skipped] Merge "Reset the IRK after all devices are unpaired" into rvc-dev am:
02e9ee37f8 -s ours
am skip reason: Merged-In I8e44f010a72dcdec595d81293a05f49ccc054065 with SHA-1
0e5bb13f66 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16232311
Change-Id: I1cf19c8a3a8d94cc61cdaea62fdd2ff42c4be241
TreeHugger Robot [Wed, 8 Dec 2021 21:56:20 +0000 (21:56 +0000)]
Merge "Reset the IRK after all devices are unpaired" into qt-dev
TreeHugger Robot [Wed, 8 Dec 2021 21:56:19 +0000 (21:56 +0000)]
Merge "Reset the IRK after all devices are unpaired" into pi-dev
TreeHugger Robot [Wed, 8 Dec 2021 21:56:00 +0000 (21:56 +0000)]
Merge "Reset the IRK after all devices are unpaired" into rvc-dev
TreeHugger Robot [Wed, 8 Dec 2021 21:55:42 +0000 (21:55 +0000)]
Merge "Reset the IRK after all devices are unpaired" into rvc-qpr-dev
TreeHugger Robot [Wed, 8 Dec 2021 21:55:29 +0000 (21:55 +0000)]
Merge "Reset the IRK after all devices are unpaired" into sc-qpr1-dev
TreeHugger Robot [Wed, 8 Dec 2021 21:55:27 +0000 (21:55 +0000)]
Merge "Reset the IRK after all devices are unpaired" into sc-dev
Ted Wang [Wed, 1 Dec 2021 15:28:44 +0000 (23:28 +0800)]
Do not cleanup offload related flag in bta_av_conn_cback
Do not cleanup offload related flag in bta_av_conn_cback to avoid
missing sending out offload stop command when disconnect during
streaming.
Tag: #stability
Bug:
207491735
Test: manual
Change-Id: I6a54ce2285b1ef2a5a88457a369d830d1966f300
Merged-In: I6a54ce2285b1ef2a5a88457a369d830d1966f300
Chris Manton [Wed, 8 Dec 2021 03:27:13 +0000 (03:27 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db am:
8396d3e4b3 am:
6af8dde13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I8f1082e3168dc73c6d4673303845f5526fad4b54
TreeHugger Robot [Wed, 8 Dec 2021 03:27:05 +0000 (03:27 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67 am:
cd24dabfa4 am:
9c82404f4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: I6d4d96053d4a0817bde19831f7d0be785c6f0744
TreeHugger Robot [Wed, 8 Dec 2021 03:26:57 +0000 (03:26 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94 am:
5343ac9e96 am:
ab7d792689
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: Iba32fb3814430fcff23a0b0b1891fed9238c2e69
Chris Manton [Wed, 8 Dec 2021 03:26:49 +0000 (03:26 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours am:
df3c352804 -s ours am:
a3f4ccc67b -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I42cf22009ce22b1b91c806bd1479fa04781d776a
Chris Manton [Wed, 8 Dec 2021 03:03:25 +0000 (03:03 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db am:
8396d3e4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I23771e66023a80828478dbefda3135fc935fd4e4
TreeHugger Robot [Wed, 8 Dec 2021 03:03:16 +0000 (03:03 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67 am:
cd24dabfa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: If603e94ba5c9441c0cea179346b26c21951d1b19
TreeHugger Robot [Wed, 8 Dec 2021 03:03:09 +0000 (03:03 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94 am:
5343ac9e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: I167478748df044bf633b818d1f80576250f51039
Chris Manton [Wed, 8 Dec 2021 03:03:02 +0000 (03:03 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours am:
df3c352804 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: I7a2b7540c955b3c1d73b87f79fe66a5af96d9c3a
Chris Manton [Wed, 8 Dec 2021 02:45:05 +0000 (02:45 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
0ae4f050db
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: I8129d0e49e8d4ce590cf1962e9fdd43e6ce3cf9e
TreeHugger Robot [Wed, 8 Dec 2021 02:44:57 +0000 (02:44 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-dev am:
e3a9267e29 am:
ff9715fa67
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215817
Change-Id: Ica8934a455aab466ca981ae949af6cccb340dcc5
TreeHugger Robot [Wed, 8 Dec 2021 02:44:48 +0000 (02:44 +0000)]
Merge "security: Use-After-Free in btm_sec_[dis]connected" into rvc-qpr-dev am:
b4a92cca94
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16207306
Change-Id: I16ffb06771a37512694d14bef5cbdcde56d8902e
Chris Manton [Wed, 8 Dec 2021 02:44:38 +0000 (02:44 +0000)]
[automerger skipped] security: Use-After-Free in btm_sec_[dis]connected am:
4f3fdf141b am:
5be9d9d621 am:
d5eda0a6e6 am:
884bfe1918 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215818
Change-Id: Ie017be63fa26f1853a1709e663b0d06c8306feab
Chris Manton [Wed, 8 Dec 2021 00:05:13 +0000 (00:05 +0000)]
security: Use-After-Free in btm_sec_[dis]connected am:
64f6fb2347 am:
6434aef9ce am:
c5d75d4ccc am:
0227d75120 am:
bdbdee6dfd am:
6a59bf886a am:
e9798276a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
16215819
Change-Id: Ic76e5d7ea9cf9fa4e88b8e6d69b95beaa8a4d2ec