git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]

Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode

Tag: #feature
Bug: 157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f

commit | commitdiff | tree

Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]

Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.

Tag: #security
Bug: 157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jun 2020 12:40:58 +0000 (12:40 +0000)]

Merge "Enable bitpool sanity checks" into oc-dev

commit | commitdiff | tree

Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]

DO NOT MERGE: Remove pairing on incoming bond request

Bug: 150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit 13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45

commit | commitdiff | tree

Joseph Pirozzo [Mon, 25 May 2020 17:36:26 +0000 (10:36 -0700)]

Enable bitpool sanity checks

Enable bitpool sanity checks to run all the time, not just in debug
mode.

Tag: #security
Test: sbcdecoder_fuzzer
Bug: 146398979
Change-Id: Iff58305cd18de35e37290f0c09fba01ee14e787a

commit | commitdiff | tree

Jakub Pawlowski [Fri, 20 Mar 2020 14:24:00 +0000 (15:24 +0100)]

Fix potential stack overflow caused by integer overflow

Bug: 151155194
Merged-In: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Change-Id: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca

commit | commitdiff | tree

Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]

GattServcer: Check invalid offset

Test: manual
Bug: 143231677
Merged-In: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Change-Id: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Dec 2019 08:04:13 +0000 (08:04 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Dec 2019 23:03:51 +0000 (23:03 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Dec 2019 00:33:29 +0000 (00:33 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Zongheng Wang [Tue, 12 Nov 2019 20:59:44 +0000 (12:59 -0800)]

SDP: add return after SDP disconnection

A return is needed after sdp_disconnect(). It is the logic
expected and it prevents the use of p_ccb after it's freed.

Bug: 144177780
Bug: 117105007
Test: manual test
Change-Id: I7a64382b36adca37a8ff0c7e361d89ecdc8f3b55
(cherry picked from commit 30efc8c90a846460359a489e17e1461c725958b3)

commit | commitdiff | tree

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

commit | commitdiff | tree

Venkata Jagadeesh Garaga [Thu, 18 Apr 2019 11:43:49 +0000 (17:13 +0530)]

GAP: Correct the continuous pkt length in l2cap

L2cap continuous pkt length wrongly calculated in
reassembly logic when remote sends more data
than expected.

Wrong pkt length leading to memory corruption

Hence the Correct the continuous pkt length in
l2cap reassembly logic.

Bug: 135239489
Bug: 143894715
CRs-Fixed: 2434229
Test: make and internal testing
Change-Id: I758d9e31465b99e436b9b1841320000f08186c97
Merged-In: I758d9e31465b99e436b9b1841320000f08186c97
(cherry picked from commit 337bd4579453bd6bf98ff519de3ac1019cd30d28)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jun 2019 15:14:18 +0000 (15:14 +0000)]

Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jun 2019 05:29:39 +0000 (05:29 +0000)]

Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Jun 2019 05:29:39 +0000 (05:29 +0000)]

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev

* changes:
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 17c45d587a
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

commit | commitdiff | tree

Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

commit | commitdiff | tree

Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

commit | commitdiff | tree

Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 am: 0433d94f23
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

commit | commitdiff | tree

Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 am: 0433d94f23 skipped: 4e06b9023f
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 am: 0433d94f23
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 31 May 2019 18:12:16 +0000 (18:12 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 am: 0433d94f23 skipped: 4e06b9023f

Change-Id: I216ca30d63a6706f8a61c79d36dc83cb7836b186

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 31 May 2019 18:12:14 +0000 (18:12 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 am: 0433d94f23

Change-Id: I5e14764ec590cace5feddb7636c771b6febb5ca0

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 31 May 2019 18:12:13 +0000 (18:12 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7

Change-Id: I2752af09d0dcf821f29f2e423220e1b13ef15396

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 31 May 2019 18:12:11 +0000 (18:12 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6

Change-Id: Iaee48fb07517f32ea191eff26f359eca7151cd38

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 31 May 2019 18:12:10 +0000 (18:12 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c

Change-Id: I025a3f1c1f261dfbc1b9bda02c835f437d85fcaa

commit | commitdiff | tree

Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]

DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:56:02 +0000 (16:56 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60 skipped: 58d5d4b7f7

Change-Id: I2e5ee164ea33bc6f845e34bc39a24f0080d9bbe9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:55:59 +0000 (16:55 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60

Change-Id: I8d3abdacbf67c5f8cbd1cf3b1fb63528b4a95811

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:55:56 +0000 (16:55 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc

Change-Id: I3d8a71cad06115d2be87a8c8a6b961ffa2827709

commit | commitdiff | tree

Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]

DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 19:18:00 +0000 (19:18 +0000)]

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 17c45d587a

Change-Id: I7677e2e0a7bf0f67e881a29fecd104c7e70cd0bf

commit | commitdiff | tree

Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]

DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c

commit | commitdiff | tree

Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]

DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit ddae6274742e241c03526c7659dca7b3446b9f8d)

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 11:19:37 +0000 (11:19 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b

Change-Id: I597400cb6894efad207e1279a2487350552224f6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 11:19:32 +0000 (11:19 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214

Change-Id: I0476fc6cf9b881ce62547df0a6e89e995df0a2dd

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 11:19:27 +0000 (11:19 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348

Change-Id: I75451392daaef9a63145c728557fcac6464729a7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 11:19:22 +0000 (11:19 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0

Change-Id: I01a711e5558df5e924aea895c86b901d36ac43f8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 29 May 2019 11:19:17 +0000 (11:19 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719

Change-Id: I50f4fd6c808a4d47455b6109e4dcaab93207bb9c

commit | commitdiff | tree

Ugo Yu [Thu, 23 May 2019 13:05:49 +0000 (21:05 +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: Ia50c42bbd7614ea13c7dd90dcfc7224f4681f479

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512 skipped: d1443d1913

Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512

Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf

Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462

Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9

Change-Id: Id63bf05a79287ec45942647075c715e858f915d1

commit | commitdiff | tree

Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]

DO NOT MERGE Send HCI Read Encryption Key properly

This patch fixes bad HCI command being send instead of Read Encryption
Key Size.

Bug: 124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 20:20:23 +0000 (20:20 +0000)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr2-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into cw-f-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr1-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-dr1-dev

* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]

Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]

Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev

commit | commitdiff | tree

Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]

DO NOT MERGE: osi: Offload mutex pointer to local scope

Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.

Bug: 117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70 skipped: d691b2dd00

Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70

Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041

Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe

Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe

Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb

commit | commitdiff | tree

Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]

DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type

Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.

Bug: 117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a

commit | commitdiff | tree

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.

Bug: 117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
(cherry picked from commit 1243f8da338dadfe2a3c281a08297b431402d41c)

commit | commitdiff | tree

Myles Watson [Wed, 1 May 2019 18:31:36 +0000 (18:31 +0000)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit 09894418589479875443037c45e596824da90928.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2
Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:23 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05

Change-Id: I7751a160ac79d810e5e8f2a545f7887ab2cfe756

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:22 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0

Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:20 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb

Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:18 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b

Change-Id: Idd6c2e065049ae432ecc44069c4344c97e46d8de

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:16 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732

Change-Id: I1a5218347cd6039a1aa48f304a55e2cce6b5d179

commit | commitdiff | tree

Myles Watson [Wed, 1 May 2019 18:28:13 +0000 (18:28 +0000)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit edd7e731edad067fe08b0623be6b2745bf81a445.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: I78f523b930d1433e39fc900d703f2317518a8b39

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]

DO NOT MERGE Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:30 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e skipped: 05e4e07328

Change-Id: Ia5e85f456ba202b1562b8f6fc2f3481f7a999691

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:23 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e

Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:19 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d

Change-Id: Idf19ab0fdf1da993701a6b24d47fccc982f3e2ff

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.