OSDN Git Service
Martin Brabham [Wed, 16 Oct 2019 04:20:22 +0000 (21:20 -0700)]
Merge "resolve merge conflicts of
26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev
am:
01c69ce222
Change-Id: Ie358b950ce8488361da18d040d5e825eda79a795
Martin Brabham [Wed, 16 Oct 2019 03:10:24 +0000 (03:10 +0000)]
Merge "resolve merge conflicts of
26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev
Martin Brabham [Wed, 2 Oct 2019 15:42:19 +0000 (08:42 -0700)]
resolve merge conflicts of
26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
110433804
Change-Id: I1ba3911607e587d13a69d2cfc4f8f905fe031141
Martin Brabham [Thu, 3 Oct 2019 16:14:38 +0000 (09:14 -0700)]
[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev
am:
6c603cedb5 -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1
a73dfccf32 is in history
Change-Id: I3becd255be392b7858a68302943deff735884477
Martin Brabham [Thu, 3 Oct 2019 15:58:42 +0000 (15:58 +0000)]
Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev
Jakub Pawlowski [Thu, 3 Oct 2019 00:16:01 +0000 (17:16 -0700)]
Fix read out of bounds in BtifAvEvent::DeepCopy
am:
8ac773aa5b
Change-Id: I7fdb4699d3aebaafe77e278786a8ddefbf0916f8
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
Jakub Pawlowski [Wed, 2 Oct 2019 13:04:38 +0000 (15:04 +0200)]
Fix read out of bounds in BtifAvEvent::DeepCopy
Bug:
140768453
Change-Id: Ia05e12382ef78a3e07228d09bcf9347f9976bffd
Martin Brabham [Wed, 2 Oct 2019 01:13:16 +0000 (18:13 -0700)]
JustWorks: Auto-accept only incoming temporary pairing. am:
10e15ee461
am:
103ba67ee2
Change-Id: I89a7a2650b3c4814a28c13a287722485d0b6eba7
Martin Brabham [Wed, 2 Oct 2019 01:06:15 +0000 (18:06 -0700)]
JustWorks: Auto-accept only incoming temporary pairing.
am:
10e15ee461
Change-Id: I392280bb44e2ab665baeab5ef5f1e6b9323fe463
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
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: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: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: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
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
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 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
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: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: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
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)
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
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: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: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
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
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 [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 [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
TreeHugger Robot [Mon, 1 Jul 2019 22:11:59 +0000 (22:11 +0000)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
Myles Watson [Wed, 26 Jun 2019 17:27:19 +0000 (10:27 -0700)]
RootCanal: Make beacons less verbose
Fixes:
136287879
Test: scan for Bluetooth devices, watch logcat
Change-Id: I971a7e56359adc39d006a1b10b5333c2f31ebaff
(cherry picked from commit
0d5adc6fac590dc14f46790b3962c40712303aea)
Myles Watson [Fri, 21 Jun 2019 13:04:08 +0000 (06:04 -0700)]
DO NOT MERGE RootCanal: Always add default devices
Fixes:
129546852
Test: android.bluetooth.cts.BluetoothLeScanTest#testBasicBleScan
Change-Id: I9912dc7a98155972483e1e1dca812ebbae806bdd
(cherry picked from commit
38767e7f973616ecd020e90572d6ddc73e24c5e3)
Merged-In: I9912dc7a98155972483e1e1dca812ebbae806bdd
Zhijun He [Wed, 19 Jun 2019 04:44:18 +0000 (04:44 +0000)]
Revert "libprocessgroup users use libcutils"
This reverts commit
93e1622ba65005d5611fc315503e4ed2f8a09658.
Reason for revert: breaks all camera use cases
Bug:
135568875
Exempt-From-Owner-Approval: revert, no build cop
Change-Id: I0b75d516e10a3432c71efd70ff100bf51e0e6d43
Andre Eisenbach [Thu, 13 Jun 2019 18:50:57 +0000 (11:50 -0700)]
Limit sniff mode for Nintendo Pro Controller to 11.25ms
Bug:
133410149
Test: manual
Change-Id: I4bffb759323bedd36e754cf758ac1d61cffc886e
(cherry picked from commit
b62d0a17ec545fb477a5155790e9e96d1472659b)
TreeHugger Robot [Wed, 19 Jun 2019 01:30:38 +0000 (01:30 +0000)]
Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev
Martin Brabham [Fri, 14 Jun 2019 16:27:42 +0000 (16:27 +0000)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
This reverts commit
9437cbc24014799738c85da8f416a647f8cbf3e2.
Reason for revert: Waiting for QT first SMR due to b/
134461862
Bug:
134461862
Change-Id: I3fea0f2d10658d6e154a946eaaa9fbdeb4b49159
Steven Moreland [Thu, 13 Jun 2019 00:18:46 +0000 (17:18 -0700)]
libprocessgroup users use libcutils
libprocessgroup symbols are being moved into libcutils in order to
optimize linking/memory usage. libprocessgroup will no longer be
required in the future (however removing references to it will come
separately).
Bug:
135145426
Test: boot
Change-Id: I46710da29212572068f6e96967f42523455f1446
Jakub Pawlowski [Thu, 13 Jun 2019 14:31:53 +0000 (16:31 +0200)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
This patch fixes the issue, where the onConenctionStateCallback is being
called twice when device is connected. This happens only if device was
connected before, and the physical connection was kept alive.
This issue was introduced during white list refactor.
Test: GattConnectTest:test_gatt_connect_in_quick_succession
Bug:
117182283
Merged-In: Id94db9429e31224ef35eb2c99c0f9a65e7c27d32
Change-Id: Id94db9429e31224ef35eb2c99c0f9a65e7c27d32
weichinweng [Tue, 11 Jun 2019 14:02:46 +0000 (22:02 +0800)]
Load gatt_database if it is empty in bta_gattc_process_indicate
If Service Changed indication is received but gatt_database is empty,
will try to load database from storage.
Bug:
131814072
Bug:
134994428
Test: 1.CTS Bluetooth LE Secure Test. 2.Unit test.
3. Pair BLE device via APP. 4. Pair device via Bluetooth Setting
Change-Id: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
Merged-In: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
Jakub Pawlowski [Tue, 11 Jun 2019 11:30:04 +0000 (11:30 +0000)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
This reverts commit
ffc95919835bbf89d635516955bff1b3b8a17641.
Reason for revert: breaks HA bonding from within app.
Bug:
134942525
Change-Id: I824391b1c84b535d7f251e176a5169eb79921c7f
Martin Brabham [Fri, 31 May 2019 19:53:07 +0000 (12:53 -0700)]
Confirm the presence of BT key when BT ON
After clearing Bluetooth data, the Bluetooth key will be cleared in the
same time. When turn on Bluetooth, NE happened at the step of checking
Bluetooth key.
Bug:
133214365
Test: ahost --host test net_test_bluetooth
Change-Id: I88f5dfae07352a794b304da60e09253c004fb3d4
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:30 +0000 (03:23 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours
am:
5b7daae369 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I1dba0b8ab2cdb0363f6a53939385d2d6a45d18f7
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:04 +0000 (03:23 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours
am:
dd59bd4400 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbda31c8076491dcf7c583ae6b7a12cf4c82a4f0
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:27 +0000 (03:18 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours
am:
c5837d3d81 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: Ia742ff3db6e10ecdcfae893a44ed3e766c40cbe6
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:03 +0000 (03:18 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours
am:
75384547fb -s ours
am skip reason: subject contains skip directive
Change-Id: I952f4abe93c3f75e9de141727606886ed234b8ad
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:23 +0000 (03:12 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours
am:
28a8e8b848 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I128d6b1fbeccea202ddaaa73e4a1c9032afdfda1
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:08 +0000 (03:12 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours
am:
35f2cb15f1 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
bdac7b911f is in history
Change-Id: Idd9e3a1ffa28ca0de51f37b043c452b0cde9fcfe
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:32 +0000 (03:08 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
am:
38535adcd0 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I14e6e0212fd40a7a74cc9f4672cd8ce611763761
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:09 +0000 (03:08 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
461f0b4739 -s ours
am skip reason: SHA1
461f0b4739 skipped by user jpawlowski
Change-Id: If029a012222cb9a45a593282524518f30f9f0dc6
Jakub Pawlowski [Thu, 6 Jun 2019 19:47:12 +0000 (19:47 +0000)]
Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
Jakub Pawlowski [Thu, 6 Jun 2019 18:56:11 +0000 (11:56 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours
am:
35f034bb61 -s ours
am skip reason: subject contains skip directive
Change-Id: Icfbb46e23894cdf4baf3ded483a169ab5ea225ff
Jakub Pawlowski [Thu, 6 Jun 2019 18:55:49 +0000 (11:55 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c978f86b50 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bed57af388e87495b43a36ae51b3460a0829e99
Jakub Pawlowski [Thu, 6 Jun 2019 18:54:46 +0000 (11:54 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
bdac7b911f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibddb04bcbe2ff0c0197071492e58abee2037d7dc
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:33 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
Change-Id: I0ce92d6832d71961c2774d523ccaff25aae6ee75
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:29 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
Change-Id: I462281e1e328875bff50defc951aa436245740da
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:26 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
Change-Id: Idcdaee2b8091c775df14722a28b56589957833f2
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:23 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
Change-Id: I570033782572166e69cd1edd65260c499473a661
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:19 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
Change-Id: Id7ceb1b67894931e9c0ce188dff19177afd4a7ee
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Merged-In: Ibd983e96bc339393842d4c2e2aa226534095e225
Ugo Yu [Wed, 5 Jun 2019 04:07:13 +0000 (21:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours
am:
0f3b13b40e -s ours
am skip reason: subject contains skip directive
Change-Id: I55f9c0499721b51ba077b8743835fbead8edc775
Ugo Yu [Wed, 5 Jun 2019 04:07:07 +0000 (21:07 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours
am:
1c2cf08476 -s ours
am skip reason: subject contains skip directive
Change-Id: I72d5bbb01e393fb940bad5cc58e51e71f6d5b200
Ugo Yu [Wed, 5 Jun 2019 03:56:43 +0000 (20:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours
am:
d9997755f9 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688