OSDN Git Service
Ted Wang [Tue, 26 Nov 2019 03:46:38 +0000 (11:46 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than
HCI_EXT_FEATURES_PAGE_MAX.
Bug:
141552859
Bug:
144205318
Test: inject function
Merged-In: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Change-Id: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Automerger Merge Worker [Tue, 26 Nov 2019 03:46:52 +0000 (03:46 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-mr1-dev am:
c5cbe3c7fb
Change-Id: I6cc380ce5e08ea003cc2d12a767cff8a53705b6e
Ted Wang [Tue, 26 Nov 2019 03:33:50 +0000 (03:33 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into pi-dev
Ted Wang [Tue, 26 Nov 2019 03:33:50 +0000 (03:33 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-mr1-dev
Automerger Merge Worker [Tue, 26 Nov 2019 03:04:10 +0000 (03:04 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec am:
53afb387a4 am:
a651e35ad0
Change-Id: Idf9a04bc8291f8e08ca504c373d77750c1280b74
Automerger Merge Worker [Tue, 26 Nov 2019 02:55:04 +0000 (02:55 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec am:
53afb387a4
Change-Id: I22fb89a33d6265470d4dc82a19d3ff66ce1ad9fa
Automerger Merge Worker [Tue, 26 Nov 2019 02:45:55 +0000 (02:45 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec
Change-Id: I2cc0a9befe3c2b0412d53bad6b7790e61119cae2
Ted Wang [Tue, 26 Nov 2019 02:37:56 +0000 (02:37 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev
Adam Seaton [Fri, 22 Nov 2019 19:29:41 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
9935f2ba7d9e78ff4c82bd3384960e27072a0b21.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I41dbcc0c5cb88dc72b13db2dd76e4751d7e98a6c
Adam Seaton [Fri, 22 Nov 2019 19:29:29 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
0d7723d147012c3141d259cce24745eb446ff1b1.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I96ec04beeb8eb4cb307f45c3c2a02d267c00c8fc
Adam Seaton [Fri, 22 Nov 2019 19:29:14 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
33a71f2955f1254d2f96fd4a4d16d44463a21423.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I6e1d62f370fc910e91c0919dcb3f37fa2f3c7bf5
Ted Wang [Wed, 6 Nov 2019 21:19:25 +0000 (13:19 -0800)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
981e2483c6 am:
4b700057ae -s ours
am:
b830f4e39c -s ours
am skip reason: change_id I3bd7349f382aa0e42123bbd835dcb60b77af099a with SHA1
9935f2ba7d is in history
Change-Id: I34998950f7353d3820099e30823abd371de06cf4
TreeHugger Robot [Wed, 6 Nov 2019 21:15:03 +0000 (21:15 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev
Ted Wang [Wed, 6 Nov 2019 21:13:44 +0000 (13:13 -0800)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
981e2483c6
am:
4b700057ae -s ours
am skip reason: change_id I3bd7349f382aa0e42123bbd835dcb60b77af099a with SHA1
0d7723d147 is in history
Change-Id: I4e3cea1e80f91d5a7789fa5305a1fafea6690a70
Ted Wang [Wed, 6 Nov 2019 21:08:00 +0000 (13:08 -0800)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev
am:
981e2483c6
Change-Id: Iba00aec2298d8b6522555a56ba02b3dba5b7de3b
Ted Wang [Wed, 6 Nov 2019 18:08:13 +0000 (10:08 -0800)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev
am:
82e29feb42
Change-Id: I6d685ffb735c1ff96224ec19d8eab569f4b2c2f2
TreeHugger Robot [Wed, 6 Nov 2019 17:55:06 +0000 (17:55 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev
TreeHugger Robot [Wed, 6 Nov 2019 17:48:42 +0000 (17:48 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Nick Desaulniers [Wed, 16 Oct 2019 04:20:22 +0000 (21:20 -0700)]
[system][bt] fix -Wdangling-gsl am:
20ed45d633 am:
2f0c176bad
am:
2bcb84cd7d
Change-Id: I216e30fb5fb6ca5cadb7821d33825db4f197d087
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
Nick Desaulniers [Tue, 15 Oct 2019 21:31:31 +0000 (14:31 -0700)]
[system][bt] fix -Wdangling-gsl am:
20ed45d633
am:
2f0c176bad
Change-Id: I82b0d0a3b21111b8711d58609c3f70f4637bc74b
Nick Desaulniers [Tue, 15 Oct 2019 21:24:30 +0000 (14:24 -0700)]
[system][bt] fix -Wdangling-gsl
am:
20ed45d633
Change-Id: I9f59103dc40ae2154a2b2314d309ba0f7184376a
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Nick Desaulniers [Thu, 10 Oct 2019 21:04:47 +0000 (14:04 -0700)]
[system][bt] fix -Wdangling-gsl
BtAddrString() returns a std::string. It's not safe to chain a call to
c_str() as otherwise the returned std::string is a temporary, and the
expression evaluates to an immediately dangling pointer.
Bug:
139945549
Bug:
142558228
Test: mm
Change-Id: I30972458abcc563b24ee0d80b289c3efd6c3e04d
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
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 15:58:42 +0000 (15:58 +0000)]
Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev
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 [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: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: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
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
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: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 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)
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: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
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 [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)
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: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
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
Ugo Yu [Wed, 5 Jun 2019 03:56:38 +0000 (20:56 -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 skip reason: subject contains skip directive
Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385
Ugo Yu [Wed, 5 Jun 2019 03:51:54 +0000 (20:51 -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 skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I739288fe523814fce940eb2b33aa84d328af92c0
Ugo Yu [Wed, 5 Jun 2019 03:51:42 +0000 (20:51 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881
am:
5f8f0c8b74 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751
Ugo Yu [Wed, 5 Jun 2019 03:44:59 +0000 (20:44 -0700)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
b751ea3a90
Change-Id: I4fd4b7d5d0328f40688fa2cd2321b95c12beb99e
Ugo Yu [Wed, 5 Jun 2019 03:44:47 +0000 (20:44 -0700)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
5240e71881
Change-Id: I12aa00ba24326d58ce73f15b6ddc82f22201945e
TreeHugger Robot [Wed, 5 Jun 2019 03:26:32 +0000 (03:26 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Wed, 5 Jun 2019 02:31:14 +0000 (19:31 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd
am:
fa24cbf097
Change-Id: I332b22ee718458d95df4e549238244f3117aa294
Ugo Yu [Wed, 5 Jun 2019 02:31:09 +0000 (19:31 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c
am:
0a1f845e2a -s ours
am skip reason: subject contains skip directive
Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a
Ugo Yu [Thu, 23 May 2019 11:54:41 +0000 (19:54 +0800)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
- Do not stay in bonding state if the device is paried but still
discovering service.
- Report BOND_BONDED to Java after authentication for a classic
Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails
Bug:
79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6
Ugo Yu [Wed, 5 Jun 2019 01:55:52 +0000 (18:55 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da
am:
c0f88cbbfd
Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6
Ugo Yu [Wed, 5 Jun 2019 01:55:48 +0000 (18:55 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2
am:
f4da01925c
Change-Id: I548d7448fa6562b01ca6f8d7b63621f17679945c
Ugo Yu [Wed, 5 Jun 2019 01:03:32 +0000 (18:03 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev
am:
421f1492da
Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb
Ugo Yu [Wed, 5 Jun 2019 01:03:30 +0000 (18:03 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b
am:
5b7685e7a2
Change-Id: I13263a937d23bbfd624afcb92f5a4b76f240a258
Ugo Yu [Tue, 4 Jun 2019 19:56:38 +0000 (12:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am:
1ab9bad8f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bc81925f4a8a1f8d467d348fa5844fd1230cf6c
Ugo Yu [Tue, 4 Jun 2019 19:44:40 +0000 (12:44 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
9d5a28a536 -s ours
am skip reason: subject contains skip directive
Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd
TreeHugger Robot [Tue, 4 Jun 2019 17:33:21 +0000 (17:33 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
TreeHugger Robot [Tue, 4 Jun 2019 17:09:40 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev