OSDN Git Service
Martin Brabham [Wed, 2 Oct 2019 01:13:56 +0000 (18:13 -0700)]
[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" am:
caff42bd3c -s ours am:
a3330ce66a
am:
be1be9d6ce
Change-Id: I0f34367a11e23ed16c748f08f1a4d0a570bcccc9
Martin Brabham [Wed, 2 Oct 2019 01:13:34 +0000 (18:13 -0700)]
JustWorks: Auto-accept only incoming temporary pairing. am:
a73dfccf32
am:
ac0dc29844
Change-Id: Icfd485bf0948fdbc744b5e74dcf16bb8b12b1ab6
Martin Brabham [Wed, 2 Oct 2019 01:07:51 +0000 (18:07 -0700)]
[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" am:
caff42bd3c -s ours
am:
a3330ce66a
Change-Id: I8d329840d1b0c168b5876c6cd85cd28fee0b5f72
Martin Brabham [Wed, 2 Oct 2019 01:07:33 +0000 (18:07 -0700)]
JustWorks: Auto-accept only incoming temporary pairing.
am:
a73dfccf32
Change-Id: If2371493e1dc6d0ac4d3be413c847f1a0a115ccd
Martin Brabham [Wed, 2 Oct 2019 01:06:08 +0000 (18:06 -0700)]
[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
am:
caff42bd3c -s ours
am skip reason: subject contains skip directive
Change-Id: I28ca9e4d3b1995295a392f58f1e973e2212968ac
Martin Brabham [Sat, 8 Jun 2019 04:58:52 +0000 (04:58 +0000)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
This reverts commit
26ba26be830f04e6fd9c77b075bcae48677d4cce.
Reason for revert: breaks tv UX
Bug:
110433804
Change-Id: I2c644ed62619f34494be0a0c7c75078cec0ebdd3
Martin Brabham [Thu, 20 Jun 2019 15:59:24 +0000 (08:59 -0700)]
JustWorks: Auto-accept only incoming temporary pairing.
Bug:
110433804
Bug:
134461862
Test: Manual; atest net_test_bluetooth
Change-Id: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
Merged-In: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
Rahul Sabnis [Sat, 28 Sep 2019 01:30:30 +0000 (18:30 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am:
ca7cd4593a am:
92b5515436 -s ours am:
81e5d13abe -s ours am:
ec4d990050 -s ours am:
46737356e4 -s ours
am:
44e1d2b303 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
ecf8f751b0 is in history
Change-Id: I802ce80c487aeff34ac9cbee57e41f879ef66b4b
Rahul Sabnis [Sat, 28 Sep 2019 01:23:59 +0000 (18:23 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am:
ca7cd4593a am:
92b5515436 -s ours am:
81e5d13abe -s ours am:
ec4d990050 -s ours
am:
46737356e4 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
ecf8f751b0 is in history
Change-Id: Ibcb246f3dc79f1c3134528a61c405fa4b475e559
Rahul Sabnis [Sat, 28 Sep 2019 01:16:58 +0000 (18:16 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am:
ca7cd4593a am:
92b5515436 -s ours am:
81e5d13abe -s ours
am:
ec4d990050 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
ecf8f751b0 is in history
Change-Id: I229bcea18a55e7c62cce886a13e6083ebe37dbc3
Rahul Sabnis [Sat, 28 Sep 2019 01:10:20 +0000 (18:10 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am:
88452a2e0d -s ours am:
cd2d913f94 -s ours am:
b50e15f579 -s ours
am:
d630936ce0 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: I4a77caea23a6387a05a3347e020f5ae06370f5db
Rahul Sabnis [Sat, 28 Sep 2019 01:09:57 +0000 (18:09 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev am:
2e2864e169 -s ours am:
bab739ce60 -s ours
am:
045f9949e7 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: I296c7786162b4e7c290e4eefda818b5a866f8e31
Rahul Sabnis [Sat, 28 Sep 2019 01:09:56 +0000 (18:09 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am:
ca7cd4593a am:
92b5515436 -s ours
am:
81e5d13abe -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
ecf8f751b0 is in history
Change-Id: Ia3d8616b3d0cbb86e9ddbe0f0154594a58f0914f
Rahul Sabnis [Sat, 28 Sep 2019 01:05:17 +0000 (18:05 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am:
88452a2e0d -s ours am:
cd2d913f94 -s ours
am:
b50e15f579 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: Id3a6bced31d944ea55c6d27baee754a8cb6917fa
Rahul Sabnis [Sat, 28 Sep 2019 01:04:54 +0000 (18:04 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev am:
2e2864e169 -s ours
am:
bab739ce60 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: Ic1d664b57e5ef5eb6d3e4d0926dd7ccf3e8b620d
Rahul Sabnis [Sat, 28 Sep 2019 01:03:55 +0000 (18:03 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am:
88452a2e0d -s ours
am:
cd2d913f94 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: Ic1f84b471d78143f521ca4cd13eec0bf7febca28
Rahul Sabnis [Sat, 28 Sep 2019 01:03:54 +0000 (18:03 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev am:
ca7cd4593a
am:
92b5515436 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
ecf8f751b0 is in history
Change-Id: I9fdc5544ebca6f8849ae522890eb5774b5cc914f
Jakub Pawlowski [Sat, 28 Sep 2019 00:58:14 +0000 (00:58 +0000)]
Merge "btm_ble_conn_complete: use pseudo address type together with pseudo address" into qt-qpr1-dev
Rahul Sabnis [Sat, 28 Sep 2019 00:57:56 +0000 (17:57 -0700)]
Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev
am:
ca7cd4593a
Change-Id: I2b44586f43a2249034a286338c2ba68b78339cb7
Rahul Sabnis [Sat, 28 Sep 2019 00:57:54 +0000 (17:57 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev
am:
88452a2e0d -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
969ebed816 is in history
Change-Id: Ib38f1eeb7bac5fcf5b48b4d72d92e5546389c7ed
Rahul Sabnis [Sat, 28 Sep 2019 00:57:54 +0000 (17:57 -0700)]
[automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev
am:
2e2864e169 -s ours
am skip reason: change_id Iee71ce35576e438317841d41a81fda6a87e1984a with SHA1
50bf4cf1bf is in history
Change-Id: Icbe38484058fc4d1f2af1445cb4c2c1ff6634627
TreeHugger Robot [Sat, 28 Sep 2019 00:40:38 +0000 (00:40 +0000)]
Merge "Use memcpy instead of casting to convert device_class to int" into oc-dev
TreeHugger Robot [Sat, 28 Sep 2019 00:40:01 +0000 (00:40 +0000)]
Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev
TreeHugger Robot [Sat, 28 Sep 2019 00:37:34 +0000 (00:37 +0000)]
Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev
Rahul Sabnis [Fri, 27 Sep 2019 22:54:22 +0000 (15:54 -0700)]
Merge "Use memcpy instead of casting to convert device_class to int" into qt-dev am:
69ee68fd8b
am:
4256548ce6
Change-Id: I7aa3ea72d94373de6d01b1befbb15ffb5ff9dbfd
Rahul Sabnis [Fri, 27 Sep 2019 22:47:57 +0000 (15:47 -0700)]
Merge "Use memcpy instead of casting to convert device_class to int" into qt-dev
am:
69ee68fd8b
Change-Id: I908e28c8a7797cdcf840654449f7d05a13e929e1
TreeHugger Robot [Fri, 27 Sep 2019 22:28:30 +0000 (22:28 +0000)]
Merge "Use memcpy instead of casting to convert device_class to int" into qt-dev
Zongheng Wang [Fri, 27 Sep 2019 22:01:23 +0000 (15:01 -0700)]
SDP: Disconnect when there is a bad length am:
7f555a1a9b am:
325d1539ba am:
23bcf92253 am:
736669e4a5 am:
4a8fc7789e
am:
5771119d00
Change-Id: I47a1e764985c3eb0ce1a0cc20ffc331d24f2fe36
Zongheng Wang [Fri, 27 Sep 2019 22:00:57 +0000 (15:00 -0700)]
SDP: disconnect if sdp_copy_raw_data fails am:
41939a2b5a am:
e6bda7c73b am:
ae973c7782 am:
2dc8860396 am:
5d03b9c3fd
am:
b0b19204e0
Change-Id: Ie995eada573b930ea36f10f803abbdf63ce5070e
Zongheng Wang [Fri, 27 Sep 2019 21:52:22 +0000 (14:52 -0700)]
SDP: Disconnect when there is a bad length am:
7f555a1a9b am:
325d1539ba am:
23bcf92253 am:
736669e4a5
am:
4a8fc7789e
Change-Id: Iee49e1f37dd060b3d9bc014dca272273082ec354
Zongheng Wang [Fri, 27 Sep 2019 21:51:58 +0000 (14:51 -0700)]
SDP: disconnect if sdp_copy_raw_data fails am:
41939a2b5a am:
e6bda7c73b am:
ae973c7782 am:
2dc8860396
am:
5d03b9c3fd
Change-Id: I3fa65a8d00c62896ee542f5ec22cac39e64e93e0
Zongheng Wang [Fri, 27 Sep 2019 21:45:57 +0000 (14:45 -0700)]
SDP: Disconnect when there is a bad length am:
7f555a1a9b am:
325d1539ba am:
23bcf92253
am:
736669e4a5
Change-Id: If70ce170d5aefa143635218cbe0ae922fffc3a01
Zongheng Wang [Fri, 27 Sep 2019 21:45:29 +0000 (14:45 -0700)]
SDP: disconnect if sdp_copy_raw_data fails am:
41939a2b5a am:
e6bda7c73b am:
ae973c7782
am:
2dc8860396
Change-Id: I55a374d40550c8a42e61762606f3580e439c0725
Zongheng Wang [Fri, 27 Sep 2019 21:38:01 +0000 (14:38 -0700)]
SDP: Disconnect when there is a bad length am:
7f555a1a9b am:
325d1539ba
am:
23bcf92253
Change-Id: I8d078555cba1231252f8d9cbf9c9f911f91a8cb3
Zongheng Wang [Fri, 27 Sep 2019 21:37:33 +0000 (14:37 -0700)]
SDP: disconnect if sdp_copy_raw_data fails am:
41939a2b5a am:
e6bda7c73b
am:
ae973c7782
Change-Id: I7c4e10c31d265a7f7cef79a938078376d3a7c16d
Zongheng Wang [Fri, 27 Sep 2019 21:31:23 +0000 (14:31 -0700)]
SDP: Disconnect when there is a bad length am:
7f555a1a9b
am:
325d1539ba
Change-Id: I21d1ab45bfe4f1e13a8e168abaafaafb1ccb1198
Zongheng Wang [Fri, 27 Sep 2019 21:30:53 +0000 (14:30 -0700)]
SDP: disconnect if sdp_copy_raw_data fails am:
41939a2b5a
am:
e6bda7c73b
Change-Id: Ia3f4fe31ed2f8ea056a1dd0d3b07b8af6799dc19
Zongheng Wang [Fri, 27 Sep 2019 21:24:46 +0000 (14:24 -0700)]
SDP: Disconnect when there is a bad length
am:
7f555a1a9b
Change-Id: Ia4da75e08758cda98a79bdd1f37be2480e36c71d
Zongheng Wang [Fri, 27 Sep 2019 21:24:22 +0000 (14:24 -0700)]
SDP: disconnect if sdp_copy_raw_data fails
am:
41939a2b5a
Change-Id: Icf97e5e7008909461c92ec761c8ced647002754f
Jakub Pawlowski [Wed, 25 Sep 2019 11:39:33 +0000 (13:39 +0200)]
btm_ble_conn_complete: use pseudo address type together with pseudo address
Currently, when the pseudo address type doesn't match the received address
type, we can end up modifying the security record with bad address type
in call to btm_ble_connected.
Bug:
141186673
Bug:
139825901
Bug:
140847046
Change-Id: I7ea60dde6e0876a5e757006024490a2cc155a370
(cherry picked from commit
c664929ed00cb38ad176b96a93a4071331607e15)
Jakub Pawlowski [Wed, 25 Sep 2019 08:56:49 +0000 (10:56 +0200)]
BLE advertisement processing: use stored report address type when match is found
Inside btm_ble_process_adv_addr, when we find a match to existing
security record, we should use not only the address, but also the
address type of the existing record.
Bug:
141186673
Bug:
139825901
Bug:
140847046
Test: Bond with device using it's public address, then scan and find it
using it's random address, verify bt_config.conf file content.
Change-Id: I313d54d1e53d06ae292480d195653f0212a3d681
(cherry-picked from
a5835743d43b0f7bf5b9864a8090a8a6b8d127a5)
Jakub Pawlowski [Mon, 23 Sep 2019 20:27:12 +0000 (22:27 +0200)]
Fix BLE device reconnections
Some BLE devices would advertise using both their RPA and Public
address. If such device was discovered using it's RPA, but later it's
overriden by Public address, we might have trouble reconnecting to it
due to the logic in whitelist handling code. This logic should prefer
Identity Address over any other type of address.
Test: Bond with BLE device, modify the AddrType in bt_config.conf file,
try to reconnect. We should use Address Type stored in LE_KEY_PID
Bug:
141186673
Bug:
139825901
Bug:
140847046
Change-Id: If27032f53dd655983ee5d5bc6d07b55d7458078f
Zongheng Wang [Wed, 21 Aug 2019 00:56:04 +0000 (17:56 -0700)]
SDP: Disconnect when there is a bad length
Handle the case when SDP_RAW_DATA_INCLUDED is FALSE.
Related to: I9f0df8b2de28970e7d69b737ce5d363785183bf3
Bug:
137239831
Bug:
117105007
Test: manual test
Change-Id: I354494565005f2ca9093486546fc54c145066413
Merged-In: I354494565005f2ca9093486546fc54c145066413
(cherry picked from commit
e45fe0a8ec678c73c57967b69c2fd485eef92927)
Ted Wang [Fri, 20 Sep 2019 01:35:29 +0000 (18:35 -0700)]
Fix potential OOB read in sdpu_get_len_from_type am:
fa800d23fa am:
9f26f5c19b am:
e85a439780 am:
d07c7f1412
am:
4b881cfca1
Change-Id: I7e7b64f0d613abedb3d7230d205152dc1d99d1d8
Ted Wang [Fri, 20 Sep 2019 01:28:44 +0000 (18:28 -0700)]
Fix potential OOB read in sdpu_get_len_from_type am:
fa800d23fa am:
9f26f5c19b am:
e85a439780
am:
d07c7f1412
Change-Id: I212560b012e42e4e5d9504bf7be704a11fc1bf96
Ted Wang [Fri, 20 Sep 2019 01:22:41 +0000 (18:22 -0700)]
Fix potential OOB read in sdpu_get_len_from_type am:
fa800d23fa am:
9f26f5c19b
am:
e85a439780
Change-Id: Ic92fcfa82fd26d4797f64d968e08fe1270104384
Ted Wang [Fri, 20 Sep 2019 01:16:39 +0000 (18:16 -0700)]
Fix potential OOB read in sdpu_get_len_from_type am:
fa800d23fa
am:
9f26f5c19b
Change-Id: I41a4a4710edba1b5c052338ed17ff18db058eb94
Ted Wang [Fri, 20 Sep 2019 01:10:45 +0000 (18:10 -0700)]
Fix potential OOB read in sdpu_get_len_from_type
am:
fa800d23fa
Change-Id: I06b19e7e195f7d0f80b8371b58a003809bd1f9c5
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
(This commit was skipped from oc-dr1-dev down, so the Merged-In tag is
from a later CL to avoid a conflict)
Bug:
117105007
Test: Manul
Change-Id: I1bb50e840a977df1c0403f3cce2d73dd1a73aa62
Merged-In: I9f0df8b2de28970e7d69b737ce5d363785183bf3
(cherry picked from commit
1243f8da338dadfe2a3c281a08297b431402d41c)
(cherry picked from commit
4d8e1d63e1a2116c47702d38d858f5a742e8292f)
Myles Watson [Wed, 18 Sep 2019 19:16:05 +0000 (12:16 -0700)]
[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am:
4291c84baa -s ours am:
2b28faafa0 -s ours am:
a03b3585db -s ours am:
44ec263e5c -s ours
am:
fe9eb186ac -s ours
am skip reason: change_id Ib642f79ed22b65ede5ff786cb1e163d172480f11 with SHA1
d4f012bc80 is in history
Change-Id: I5d5e8ff324fe454c49380d1cbb4f8453bee26aac
Myles Watson [Wed, 18 Sep 2019 19:09:24 +0000 (12:09 -0700)]
[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am:
4291c84baa -s ours am:
2b28faafa0 -s ours am:
a03b3585db -s ours
am:
44ec263e5c -s ours
am skip reason: change_id Ib642f79ed22b65ede5ff786cb1e163d172480f11 with SHA1
d4f012bc80 is in history
Change-Id: Icb2adee4a9d3b21908181dd5ad323ec415b0010f
Myles Watson [Wed, 18 Sep 2019 19:05:38 +0000 (12:05 -0700)]
[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am:
4291c84baa -s ours am:
2b28faafa0 -s ours
am:
a03b3585db -s ours
am skip reason: subject contains skip directive
Change-Id: I4544f77006664ae0bdef00369f01fea77ca02761
Myles Watson [Wed, 18 Sep 2019 18:56:34 +0000 (11:56 -0700)]
[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am:
4291c84baa -s ours
am:
2b28faafa0 -s ours
am skip reason: subject contains skip directive
Change-Id: I78f9c36cbf4c97a252e06b4e2b1862799f93f48d
Myles Watson [Wed, 18 Sep 2019 18:50:21 +0000 (11:50 -0700)]
[automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
am:
4291c84baa -s ours
am skip reason: change_id Ib642f79ed22b65ede5ff786cb1e163d172480f11 with SHA1
d4f012bc80 is in history
Change-Id: I73d7f92b5dc4ab723c721edbc53131e8be6c3d79
TreeHugger Robot [Wed, 18 Sep 2019 00:56:12 +0000 (00:56 +0000)]
Merge "Add the package name to setBluetoothTethering" into qt-qpr1-dev
Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]
DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr
(This CL is missed between oc-dev and oc-mr1-dev)
Bug:
115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Merged-In: Ib642f79ed22b65ede5ff786cb1e163d172480f11
(cherry picked from commit
d4f012bc80bc68be1cab967958d4cf7e9c1ee442)
Rahul Sabnis [Fri, 30 Aug 2019 01:23:37 +0000 (18:23 -0700)]
Use memcpy instead of casting to convert device_class to int
Bug:
140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit
ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)
Rahul Sabnis [Fri, 30 Aug 2019 01:23:37 +0000 (18:23 -0700)]
Use memcpy instead of casting to convert device_class to int
Bug:
140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit
ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)
Rahul Sabnis [Fri, 30 Aug 2019 01:23:37 +0000 (18:23 -0700)]
Use memcpy instead of casting to convert device_class to int
Bug:
140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit
ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)
Rahul Sabnis [Fri, 30 Aug 2019 01:23:37 +0000 (18:23 -0700)]
Use memcpy instead of casting to convert device_class to int
Bug:
140152619
Test: atest net_test_btcoreclear
Change-Id: Iee71ce35576e438317841d41a81fda6a87e1984a
Merged-In: Iee71ce35576e438317841d41a81fda6a87e1984a
(cherry picked from commit
ec75f1efb6b9be4933225a4b724e7a3ef5e3d70b)
Zongheng Wang [Mon, 5 Aug 2019 19:45:35 +0000 (12:45 -0700)]
SDP: disconnect if sdp_copy_raw_data fails
Our partners met with the problem with sdp_copy_raw_data updated in
CVE-2019-2116. When peer device responds with a wrong size,
sdp_copy_raw_data will not complete and won't trigger
disconnection. This CL enables the disconnection when a wrong size is
received.
Bug:
137239831
Bug:
117105007
Test: manual test
Change-Id: I9f0df8b2de28970e7d69b737ce5d363785183bf3
Merged-In: I9f0df8b2de28970e7d69b737ce5d363785183bf3
(cherry picked from commit
bc9df3451dad17c1ab1002fdbc85d60e57d4f0af)
Jakub Pawlowski [Wed, 11 Sep 2019 21:20:40 +0000 (21:20 +0000)]
Merge "BLE: Updating the WL if addr_type is not matched for same BDaddr" into qt-qpr1-dev
Ugo Yu [Wed, 11 Sep 2019 17:29:24 +0000 (10:29 -0700)]
[automerger skipped] resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am:
9bc574c618 -s ours am:
db61bc8978 -s ours am:
40ac062848 -s ours am:
ee56071b66 -s ours
am:
5c3e64afe7 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: I8cb0925a5a44e504051ee0970013dc1fc8bf7ae1
Ugo Yu [Wed, 11 Sep 2019 17:22:19 +0000 (10:22 -0700)]
[automerger skipped] resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am:
9bc574c618 -s ours am:
db61bc8978 -s ours am:
40ac062848 -s ours
am:
ee56071b66 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: I3c511fd11e78acc9a8ba928ddd0d8a006d2aa20f
Ugo Yu [Wed, 11 Sep 2019 17:15:16 +0000 (10:15 -0700)]
[automerger skipped] resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am:
9bc574c618 -s ours am:
db61bc8978 -s ours
am:
40ac062848 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: Ie70ddf9c2a82f51eaca9704974fd734b846553bb
Ugo Yu [Wed, 11 Sep 2019 17:08:15 +0000 (10:08 -0700)]
[automerger skipped] resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am:
9bc574c618 -s ours
am:
db61bc8978 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: I2f3f74f49288ff10fbb570f94a5a6eac6b1d421e
Ugo Yu [Wed, 11 Sep 2019 17:01:13 +0000 (10:01 -0700)]
[automerger skipped] resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev
am:
9bc574c618 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: Iffd5b655457623e328f3cce1a5894d8a611cd417
Ugo Yu [Wed, 11 Sep 2019 05:52:45 +0000 (13:52 +0800)]
resolve merge conflicts of
098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev
Bug:
79703832
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id582a274929f10d65e22d71f61de4b8953fed18e
Merged-In: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
Janardhana Rao Bokka [Tue, 10 Sep 2019 04:31:16 +0000 (10:01 +0530)]
BLE: Updating the WL if addr_type is not matched for same BDaddr
Issue:
Connection is not happening with same remote device after BT
reset.
Steps to Repro:
1. Scan and connect to remote device with "Random" address
2. Toggle BT OFF and ON
3. Without scanning, App tries to connect to remote device and
device gets added as default "Public" addr_type in WL
4. Connection doesn't go through (as expected) since remote device
has "Random" address
5. App cancels the attempt or 30 sec direct connection timeout
happens. The device is marked for removal
6. App scans for the device and the correct addr_type (Random)
is now in the inquiry database in stack
7. App initiates connection for the device but the connection
attempt still goes with "Public" address type and hence never
succeeds.
RootCause:
At step 5, stack just marks the device to be removed from whitelist
(pending_removal) but doesn't actually remove it from Controller
until the next WL connection is needed. Later in step 7, when the
WL connection is needed from the App, stack attempts to add the
device to the whitelist, but realizes that the device is already in
the Controller whitelist and hence doesn't do remove and add.
There is no check to see if the device in Controller's WL is with
correct addr_type.
Fix:
When checking for remote addr that needs to be added/removed
from WL, also take into the account the remote addr_type.
Test:
Tested with the fix multiple times. Issue not seen with this fix.
Bug:
140085561
Change-Id: I415b5fa29800b975c2ebcbf95b36cf8879841b3e
Ugo Yu [Wed, 11 Sep 2019 03:36:45 +0000 (20:36 -0700)]
[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev am:
a9b50ae838 -s ours
am:
f77868ab3c -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: I8be4946ae5a23fae8a2da71b68e41a8f427b0bca
Ugo Yu [Wed, 11 Sep 2019 03:29:44 +0000 (20:29 -0700)]
[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev
am:
a9b50ae838 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1
a65f859b17 is in history
Change-Id: I5b647f66f187e1bee38a89cb15ccd13eab6cfa7e
TreeHugger Robot [Wed, 11 Sep 2019 03:14:43 +0000 (03:14 +0000)]
Merge "AVRCP: Keep the device in the map on disconnect" into qt-qpr1-dev
TreeHugger Robot [Wed, 11 Sep 2019 03:10:15 +0000 (03:10 +0000)]
Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev
Ugo Yu [Wed, 11 Sep 2019 01:39:56 +0000 (18:39 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am:
a65f859b17 -s ours am:
441b011410 -s ours am:
b1f32a5867
am:
623c1f0965
Change-Id: Ie40ba59c57628ef89e8951225551a08140e7402f
Ugo Yu [Wed, 11 Sep 2019 01:37:00 +0000 (18:37 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am:
b2334f0589 -s ours am:
10a884f61f
am:
61fcafaec8
Change-Id: Id02291491be0b55e44b73cb1d7620f5ef39854da
Ugo Yu [Wed, 11 Sep 2019 01:29:07 +0000 (18:29 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am:
a65f859b17 -s ours am:
441b011410 -s ours
am:
b1f32a5867
Change-Id: I4d4b8817a909fe33fd213029b19fd45ec0b37c80
Ugo Yu [Wed, 11 Sep 2019 01:24:34 +0000 (18:24 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am:
a65f859b17 -s ours
am:
441b011410 -s ours
am skip reason: subject contains skip directive
Change-Id: I1854ec89e994337d44522ddbf9da2366991d17a4
Ugo Yu [Wed, 11 Sep 2019 01:19:07 +0000 (18:19 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am:
b2334f0589 -s ours
am:
10a884f61f
Change-Id: I77eb3ddf1f8a06c4a88435660f82aab23e301738
Ugo Yu [Wed, 11 Sep 2019 01:08:13 +0000 (18:08 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
am:
a65f859b17 -s ours
am skip reason: subject contains skip directive
Change-Id: I33793fde2925c0a87cb043238b22862cdd7d40b3
Ugo Yu [Wed, 11 Sep 2019 01:08:13 +0000 (18:08 -0700)]
[automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
am:
b2334f0589 -s ours
am skip reason: subject contains skip directive
Change-Id: I86a56a7c0b4676005b8b39eb6c800f834b68ef41
Joonghong Park [Sun, 21 Apr 2019 23:26:58 +0000 (08:26 +0900)]
AVRCP: Keep the device in the map on disconnect
Fixes a stack crash when disconnecting AVRCP
If an AVRCP connection, established by AVRC_OPEN_IND_EVT, is disconnected
by calling DisconnectDevice() in Connection Handler, there is a corner
case that does not clear Connection Control Block (CCB) entirely of a
opened handle.
So when there is re-connection trials, partially cleared CCBs causes
a critical stack crash.
When calling DisconnectDevice() in Connection Handler, there are issues.
-Keeping removed CCB info partially, such as member variable "allocated",
even though receiving AVRC_CLOSE_IND_EVT followed by clearing
Link Control Block (LCB).
-Keeping remote device address in feature_map_
This commit fixes the issue of above scenario, by keeping handle in
device_map_ and removing to send disconnected notification
when calling DisconnectDevice().
So when receiving AVRC_CLOSE_IND_EVT, normal procedure is conducted.
Note that AVRC_CLOSE_IND_EVT is occurred by both
AVCT_DISCONNECT_IND_EVT and AVCT_DISCONNECT_CFM_EVT.
And when calling avrc_->Close() in DisconnectDevice(), it just requests
to unbind LCB instead of dealloc CCB.
And when receiving AVRC_CLOSE_IND_EVT avrc_->Close() dealloc CCB.
Bug:
139642151
Test: Test on phone with some products which has A/V Remote Control
such as Britz(BE-ME350) and airpod
Change-Id: Ic8bc3459afd4518447d6d52b1f8afb7b3e09a8b5
Signed-off-by: Joonghong Park <joonghong.park@samsung.com>
TreeHugger Robot [Fri, 30 Aug 2019 03:08:26 +0000 (03:08 +0000)]
Merge "Remove direct connection after notifying the connection up" into qt-qpr1-dev
Chalard Jean [Mon, 19 Aug 2019 09:57:55 +0000 (18:57 +0900)]
Add the package name to setBluetoothTethering
This lets Appops check for permissions correctly.
Bug:
134649258
Test: atest PanServiceTest
manual test that apps without the requisite permissions
can't turn on bluetooth tethering
Change-Id: Ibd077bfdd071b9db68064052ecf77b8dfaf8878a
Merged-In: Ibd077bfdd071b9db68064052ecf77b8dfaf8878a
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
Merged-In: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
weichinweng [Thu, 8 Aug 2019 09:30:07 +0000 (17:30 +0800)]
Remove direct connection after notifying the connection up
After notifying the connection up, remove direct connection related with
this device to make sure no client is directly connecting the device in
connection_manager.
Bug:
138819537
Test: 1. Repair BLE device 2. Reconnect BLE deivce
3. reboot DUT, make sure Hearing Aid can be connected.
Change-Id: I30ff7c47445ec2a3dbd9702ca79873063210e6df
Merged-In: I30ff7c47445ec2a3dbd9702ca79873063210e6df
weichinweng [Fri, 2 Aug 2019 08:43:09 +0000 (16:43 +0800)]
Distribute ACL buffer only for not BLE device
If LE ACL buffer is not zero from controller, will distribute ACL buffer
only for not BLE device to avoid assigning wrong quota to each device.
For BLE device, will be distribute BLE ACL buffer via l2cap ble layer.
If LE ACL buffe is zero from controller, will keep existing logic.
Bug:
136799551
Test: 1. Pair BLE and BREDR device, check whether Quota is correct.
Change-Id: Idd7079e8da3390fa9f4e42b07774df8928f2bf20
Merged-In: Idd7079e8da3390fa9f4e42b07774df8928f2bf20
Ugo Yu [Thu, 25 Jul 2019 02:03:16 +0000 (19:03 -0700)]
Store BLE keys using the address from the ble_auth_cmpl_evt
am:
311ebcedb3
Change-Id: Id473a3eac5719cf890148dc43f29becd16584fe6
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
Merged-In: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
(cherry picked from commit
0d95651e8b22b1012f1ee103e4a0b8665a0c17d4)
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
(cherry picked from commit
0d95651e8b22b1012f1ee103e4a0b8665a0c17d4)
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
(cherry picked from commit
0d95651e8b22b1012f1ee103e4a0b8665a0c17d4)
Andre Eisenbach [Wed, 10 Jul 2019 20:30:43 +0000 (13:30 -0700)]
Switch Nintendo workaround to match by name
am:
c14c14fbc4
Change-Id: I89b558a9b3e87b58e15a8358fa66258fc03a882f
Andre Eisenbach [Wed, 10 Jul 2019 20:30:00 +0000 (13:30 -0700)]
Match Nintento Pro Controller by name for interop
am:
b71ebf2d82
Change-Id: I683d6dabefeeed51e1a1e9919d3c1b1d28a47647
weichinweng [Wed, 3 Jul 2019 09:52:19 +0000 (17:52 +0800)]
Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support
Set the BLE phy to 2M if the BT controller and peer Hearing Aid device
indicate phy 2M support, otherwise, use default phy channel.
Bug:
135769508
Test: 1.Forget/Repair Hearing Aid device check whether phy is expected.
2.Disconnect/Reconnect Hearing Aid device check whether phy is expected.
3.HearingAid device power off/on, check whether phy is expected.
Change-Id: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
Merged-In: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
(cherry picked from commit
554c3598db5661ac0166eb12006d248a38723db1)
Andre Eisenbach [Mon, 8 Jul 2019 21:49:06 +0000 (14:49 -0700)]
Switch Nintendo workaround to match by name
Bug:
136478524
Test: manual
Change-Id: Ib60cd5adfc4db3ba93fe5ed8c15353225b6cf165
Andre Eisenbach [Mon, 1 Jul 2019 17:48:10 +0000 (10:48 -0700)]
Match Nintento Pro Controller by name for interop
The Nintento Pro Controller uses an unknown number of
BDA ranges (at least 3 found internally). Switching
to name matching...
Bug:
136478524
Test: manual
Change-Id: Ie2dfb700c9550af0c314759ec496a04a8e1aa062
Myles Watson [Wed, 3 Jul 2019 23:08:24 +0000 (16:08 -0700)]
RootCanal: Set the timer period to 1 second
am:
eb9a775086
Change-Id: Iaf7e4e6bab48fd9f882c2d0e0c53b1cd71e7ff65
Myles Watson [Mon, 1 Jul 2019 22:22:26 +0000 (15:22 -0700)]
RootCanal: Set the timer period to 1 second
Reduce the CPU overhead of simulating the Bluetooth chip.
Bug:
136503363
Test: enable Bluetooth with RootCanal
Change-Id: I3a783a4d8a46d4eef43ddbace23c672ef9f6d7f9
Merged-In: I609f917061e5d83e011edfeb61de281ff45b13e4
Myles Watson [Mon, 1 Jul 2019 22:31:26 +0000 (15:31 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
am:
155a2373f3
Change-Id: I45556790bd687e82aa2bd2effc084a5aab1160e0
TreeHugger Robot [Mon, 1 Jul 2019 22:11:59 +0000 (22:11 +0000)]
Merge "RootCanal: Make beacons less verbose" into qt-dev