OSDN Git Service

android-x86/system-bt.git
3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a...
Hansong Zhang [Thu, 8 Oct 2020 21:40:53 +0000 (21:40 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a am: 484161c4d9 am: ebf0b367db am: 47c9035c55 am: 1f892f8f59 am: d4c9e46fdd

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I4afe226e2424b97a1f33b1675ed41736e7ec1aba

3 years agotL2C_TX_COMPLETE_CB_INFO is unused am: 0afa91e3d2 am: 658e451172
Hansong Zhang [Thu, 8 Oct 2020 21:09:49 +0000 (21:09 +0000)]
tL2C_TX_COMPLETE_CB_INFO is unused am: 0afa91e3d2 am: 658e451172

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1447001

Change-Id: I8faecfc923e4a45c159932eb7d69bb96450c88c7

3 years agoL2cap fixed channel tx complete is unused am: 1f6cf09bcd am: 10ba75f184
Hansong Zhang [Thu, 8 Oct 2020 21:09:47 +0000 (21:09 +0000)]
L2cap fixed channel tx complete is unused am: 1f6cf09bcd am: 10ba75f184

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1447000

Change-Id: I6fed37dbbac5063515450d4f834c9550ff2eb178

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a...
Hansong Zhang [Thu, 8 Oct 2020 21:09:31 +0000 (21:09 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a am: 484161c4d9 am: ebf0b367db am: 47c9035c55 am: 1f892f8f59

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I261891b06e08565fd107e8c19ab43423a29172e6

3 years agotL2C_TX_COMPLETE_CB_INFO is unused am: 0afa91e3d2
Hansong Zhang [Thu, 8 Oct 2020 20:39:20 +0000 (20:39 +0000)]
tL2C_TX_COMPLETE_CB_INFO is unused am: 0afa91e3d2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1447001

Change-Id: I5b9807dde86339dd26cdd181f1a0da8f5079f678

3 years agoL2cap fixed channel tx complete is unused am: 1f6cf09bcd
Hansong Zhang [Thu, 8 Oct 2020 20:38:49 +0000 (20:38 +0000)]
L2cap fixed channel tx complete is unused am: 1f6cf09bcd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1447000

Change-Id: I1ebdfc4983fba567d29d1fd1d7c66b9fd1bb361a

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a...
Hansong Zhang [Thu, 8 Oct 2020 20:34:10 +0000 (20:34 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a am: 484161c4d9 am: ebf0b367db am: 47c9035c55

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: Ifbfec91d9b448044b301ce4b6cc0a0241a843116

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a...
Hansong Zhang [Thu, 8 Oct 2020 20:21:36 +0000 (20:21 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a am: 484161c4d9 am: ebf0b367db

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: Icf998397b53883a7c25fc94fcc1d08c69af01766

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a...
Hansong Zhang [Thu, 8 Oct 2020 19:53:48 +0000 (19:53 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a am: 484161c4d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I5af578102b0479225c0d192eee47717a49d4646b

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a
Hansong Zhang [Thu, 8 Oct 2020 19:26:52 +0000 (19:26 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa am: 5d2163956a

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I08de9b5e95e5c65b64ea3153a988c67520932a1e

3 years agotL2C_TX_COMPLETE_CB_INFO is unused
Hansong Zhang [Fri, 2 Oct 2020 18:26:23 +0000 (11:26 -0700)]
tL2C_TX_COMPLETE_CB_INFO is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5f59b1d3cb903303a76d8e53a189732188d13f56

3 years agoL2cap fixed channel tx complete is unused
Hansong Zhang [Fri, 2 Oct 2020 18:21:58 +0000 (11:21 -0700)]
L2cap fixed channel tx complete is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iae3801999b031c904f048acd3e4c27745938b520

3 years agoMerge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec am: a52643b785 am: 5c2eb5834d
Treehugger Robot [Thu, 8 Oct 2020 19:15:20 +0000 (19:15 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec am: a52643b785 am: 5c2eb5834d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453082

Change-Id: I5244329a1f0b163e76056c64c5607579b73467ac

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa
Hansong Zhang [Thu, 8 Oct 2020 19:14:34 +0000 (19:14 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9 am: 97abd549aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I1563f2793cc2d637be9935f04d9673e050dd0c67

3 years agoMerge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec am: a52643b785
Treehugger Robot [Thu, 8 Oct 2020 19:02:44 +0000 (19:02 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec am: a52643b785

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453082

Change-Id: If02abbd808241b4ec7bc02d8301089d5c0782809

3 years agoFix a security issue in sdp_server.cc am: d7573f4fa9
Hansong Zhang [Thu, 8 Oct 2020 19:00:20 +0000 (19:00 +0000)]
Fix a security issue in sdp_server.cc am: d7573f4fa9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12776129

Change-Id: I017650c339df1f8dec41594e9d2d18d7f8d7fc6a

3 years agoMerge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec
Treehugger Robot [Thu, 8 Oct 2020 18:25:37 +0000 (18:25 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec

* changes:
  Re-log stack/sdp::process_service_search_attr_rsp
  Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
  Re-log stack/smp/smp_act::smp_send_app_cback
  Check power mode only on classic links

3 years agoMerge "Encryption Key size negotiation - PTS tests" am: fa84a81ac2 am: cbd1b8eb57
Treehugger Robot [Thu, 8 Oct 2020 17:30:03 +0000 (17:30 +0000)]
Merge "Encryption Key size negotiation - PTS tests" am: fa84a81ac2 am: cbd1b8eb57

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1450736

Change-Id: Id13b348f05c30c9f6fe5e95da5ae468240e2b719

3 years agoMerge "Encryption Key size negotiation - PTS tests" am: fa84a81ac2
Treehugger Robot [Thu, 8 Oct 2020 17:02:32 +0000 (17:02 +0000)]
Merge "Encryption Key size negotiation - PTS tests" am: fa84a81ac2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1450736

Change-Id: I030b73309a72416de3b0c4bba5e7cd6cdc057097

3 years agoMerge "Encryption Key size negotiation - PTS tests"
Treehugger Robot [Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)]
Merge "Encryption Key size negotiation - PTS tests"

3 years agoMerge "hci: Fix len of the periodic sync info command" am: fd5744725a am: 51a27256dd
Treehugger Robot [Thu, 8 Oct 2020 16:15:40 +0000 (16:15 +0000)]
Merge "hci: Fix len of the periodic sync info command" am: fd5744725a am: 51a27256dd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1454816

Change-Id: I04ba22c6ac604afd5d14d47d5126a5a98ca5f4fc

3 years agoMerge "hci: Fix len of the periodic sync info command" am: fd5744725a
Treehugger Robot [Thu, 8 Oct 2020 16:03:30 +0000 (16:03 +0000)]
Merge "hci: Fix len of the periodic sync info command" am: fd5744725a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1454816

Change-Id: I8cbd0c82b87ac623c60df660c886c5fb407ea4c6

3 years agoRe-log stack/sdp::process_service_search_attr_rsp
Chris Manton [Wed, 23 Sep 2020 16:27:13 +0000 (09:27 -0700)]
Re-log stack/sdp::process_service_search_attr_rsp

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I61791e5b50d51abdaffc0f9dd6709b94c816e077

3 years agoRe-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
Chris Manton [Wed, 23 Sep 2020 16:26:49 +0000 (09:26 -0700)]
Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: If25a7f34f12bf4283e04655daebddc73b3bb3403

3 years agoRe-log stack/smp/smp_act::smp_send_app_cback
Chris Manton [Wed, 23 Sep 2020 16:27:43 +0000 (09:27 -0700)]
Re-log stack/smp/smp_act::smp_send_app_cback

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I2949e99ad5015082556308965b8cb49387af53f2

3 years agoCheck power mode only on classic links
Chris Manton [Wed, 23 Sep 2020 17:11:30 +0000 (10:11 -0700)]
Check power mode only on classic links

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie70a5fecea4909a4755f98b9393843371009a2a3

3 years agoMerge "hci: Fix len of the periodic sync info command"
Treehugger Robot [Thu, 8 Oct 2020 15:14:52 +0000 (15:14 +0000)]
Merge "hci: Fix len of the periodic sync info command"

3 years agol2cap: Fix missing connection indication am: e5d04dd0aa am: b3dd6ff468
Łukasz Rymanowski [Thu, 8 Oct 2020 14:44:13 +0000 (14:44 +0000)]
l2cap: Fix missing connection indication am: e5d04dd0aa am: b3dd6ff468

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452678

Change-Id: I3d15cddcddcc65b88ff616cad8d1f61a5b0d665c

3 years agol2cap: Fix missing connection indication am: e5d04dd0aa
Łukasz Rymanowski [Thu, 8 Oct 2020 14:35:46 +0000 (14:35 +0000)]
l2cap: Fix missing connection indication am: e5d04dd0aa

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452678

Change-Id: Id9b2685f6e56ff0ad56e96d23d7ac794bd1b1a38

3 years agohci: Fix len of the periodic sync info command
Łukasz Rymanowski [Thu, 8 Oct 2020 07:48:45 +0000 (07:48 +0000)]
hci: Fix len of the periodic sync info command

Bug: 150670922
Tag: #feature
Test: compile & manual
Sponsor: jpawlowski@
Change-Id: I56065a7b9fcaeff5d3d98e135bed8dfec987ae3b

3 years agoEncryption Key size negotiation - PTS tests
Jakub Pawlowski [Tue, 6 Oct 2020 18:33:30 +0000 (20:33 +0200)]
Encryption Key size negotiation - PTS tests

This is implementation of remaining Encryption Key Size negotiation PTS
tests.

Bug: 142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_less_than_min
Change-Id: I9ef35d2ef143b076365b956234febbc2ba668c95

3 years agol2cap: Fix missing connection indication
Łukasz Rymanowski [Wed, 7 Oct 2020 14:55:02 +0000 (14:55 +0000)]
l2cap: Fix missing connection indication

Sponsor: jpawlowski
Test: compilation
Change-Id: I42c6dd273527c4420f3466cfd11f8e6c2572e527

3 years agoMerge changes Ie94f7b5a,I7f8cc5a1,I87148e3c am: 6884062653 am: 795da89f2e
Treehugger Robot [Thu, 8 Oct 2020 09:20:13 +0000 (09:20 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c am: 6884062653 am: 795da89f2e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453078

Change-Id: Ibc2b8358de0a7253063b4a06207b8d6397ae935f

3 years agoMerge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ... am: 576ec8375d...
Treehugger Robot [Thu, 8 Oct 2020 09:20:02 +0000 (09:20 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ... am: 576ec8375d am: 0ed426b4e1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453075

Change-Id: I3c957e1dded841060af281d98adf3019ec7b3683

3 years agoMerge changes Ie94f7b5a,I7f8cc5a1,I87148e3c am: 6884062653
Treehugger Robot [Thu, 8 Oct 2020 09:08:53 +0000 (09:08 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c am: 6884062653

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453078

Change-Id: I2ab7dc2ec02fa331fbc87b13159160fd57063f18

3 years agoMerge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ... am: 576ec8375d
Treehugger Robot [Thu, 8 Oct 2020 09:07:55 +0000 (09:07 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ... am: 576ec8375d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453075

Change-Id: Ibe48e3777238fedd7a4bf32897248264a4d19c77

3 years agoMerge changes Ie94f7b5a,I7f8cc5a1,I87148e3c
Treehugger Robot [Thu, 8 Oct 2020 08:44:40 +0000 (08:44 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c

* changes:
  Add Api stack/acl/::btm_pm_is_le_link
  Re-log stack/acl/btm_acl::lmp_version_below
  Re-log stack/btm/btm_ble::BTM_SetBleDataLength

3 years agoMerge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ...
Treehugger Robot [Thu, 8 Oct 2020 08:39:36 +0000 (08:39 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ...

* changes:
  Re-log stack/btm/btm_ble::BTM_BleSetPhy
  Use common API to set hci handle
  Add common API to set hci handle
  gd: Add monitor ability to receive packet credits
  Move _process_num_completed_pkts into acl
  Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts

3 years agoGD: Enforce link encryption in L2cap am: ee110cfef1 am: 2df3b77ed5
Hansong Zhang [Thu, 8 Oct 2020 07:12:58 +0000 (07:12 +0000)]
GD: Enforce link encryption in L2cap am: ee110cfef1 am: 2df3b77ed5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443310

Change-Id: I54fee00a71febb975bf166bbf5d9c816440a3e70

3 years agoGD: Enforce link encryption in L2cap am: ee110cfef1
Hansong Zhang [Thu, 8 Oct 2020 07:01:24 +0000 (07:01 +0000)]
GD: Enforce link encryption in L2cap am: ee110cfef1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443310

Change-Id: I65ef8e87906bdf7b4de719815a464d04cdd9cf73

3 years agoAdd Api stack/acl/::btm_pm_is_le_link
Chris Manton [Wed, 23 Sep 2020 17:10:31 +0000 (10:10 -0700)]
Add Api stack/acl/::btm_pm_is_le_link

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie94f7b5a91e75aff552c1686fdd9f143c4337ea2

3 years agoRe-log stack/acl/btm_acl::lmp_version_below
Chris Manton [Wed, 23 Sep 2020 16:08:11 +0000 (09:08 -0700)]
Re-log stack/acl/btm_acl::lmp_version_below

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I7f8cc5a16178e0c1fc88bf31ba1207186bec6d48

3 years agoRe-log stack/btm/btm_ble::BTM_SetBleDataLength
Chris Manton [Wed, 23 Sep 2020 15:50:18 +0000 (08:50 -0700)]
Re-log stack/btm/btm_ble::BTM_SetBleDataLength

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I87148e3c932c671111f5a61f3a178275e9d86804

3 years agoRe-log stack/btm/btm_ble::BTM_BleSetPhy
Chris Manton [Wed, 23 Sep 2020 15:07:55 +0000 (08:07 -0700)]
Re-log stack/btm/btm_ble::BTM_BleSetPhy

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I9dee4893066ed0a80a4dac652d622909a05416fd

3 years agoUse common API to set hci handle
Chris Manton [Tue, 22 Sep 2020 17:40:21 +0000 (10:40 -0700)]
Use common API to set hci handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id30ad44e8084effd204f168cf3983da8ab31e064

3 years agoAdd common API to set hci handle
Chris Manton [Tue, 22 Sep 2020 17:18:01 +0000 (10:18 -0700)]
Add common API to set hci handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I77837cc51daaca9f89c8b5d83aa84996b2d9e38f

3 years agogd: Add monitor ability to receive packet credits
Chris Manton [Tue, 6 Oct 2020 23:14:55 +0000 (16:14 -0700)]
gd: Add monitor ability to receive packet credits

Primarily used for acl shim

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iebd60d4e41b45895aed0f7daf60941a1dff2ff59

3 years agoMove _process_num_completed_pkts into acl
Chris Manton [Mon, 5 Oct 2020 20:49:56 +0000 (13:49 -0700)]
Move _process_num_completed_pkts into acl

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie2237ad8b5ed76c024276a5c2db63c0809c680d9

3 years agoStreamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts
Chris Manton [Mon, 5 Oct 2020 20:19:24 +0000 (13:19 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I1d6072e5f526c7f2ac1b3229c2e4bdbcdbf3d083

3 years agoGD: Enforce link encryption in L2cap
Hansong Zhang [Thu, 1 Oct 2020 19:09:57 +0000 (12:09 -0700)]
GD: Enforce link encryption in L2cap

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I2cbeeab04ba23c6575f9042fd2785c2c427ce200

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d...
Treehugger Robot [Thu, 8 Oct 2020 03:31:38 +0000 (03:31 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d am: 426c10ff5e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452080

Change-Id: Ib1d0d086de4c454606641e5b7404d44ee529491a

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d
Treehugger Robot [Thu, 8 Oct 2020 03:16:12 +0000 (03:16 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452080

Change-Id: Ic2157a5036c97323a32e977154f7d819805ac5f4

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...
Treehugger Robot [Thu, 8 Oct 2020 02:53:20 +0000 (02:53 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...

* changes:
  Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
  Move btm_ble_increment_link_topology_mask l2c=>btm
  Streamline conditional stack/btm/btm_ble::btm_ble_connected
  enum-ify tL2CAP_LE_RESULT_
  Add api around select fields tL2C_CB::tL2C_LCB::
  enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

3 years agoAVRCP: Advance iterator before deleting it am: 6370db8086 am: acd0513217
Hansong Zhang [Thu, 8 Oct 2020 01:24:56 +0000 (01:24 +0000)]
AVRCP: Advance iterator before deleting it am: 6370db8086 am: acd0513217

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453980

Change-Id: I9b5f602d4b6b80b98e4ff85f28ef32db5ab5fe72

3 years agoAVRCP: Advance iterator before deleting it am: 6370db8086
Hansong Zhang [Thu, 8 Oct 2020 00:53:14 +0000 (00:53 +0000)]
AVRCP: Advance iterator before deleting it am: 6370db8086

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453980

Change-Id: I9418060d15bad8a2fb9b78e6581713d67ea0348b

3 years agoAVRCP: Advance iterator before deleting it
Hansong Zhang [Wed, 7 Oct 2020 21:50:15 +0000 (14:50 -0700)]
AVRCP: Advance iterator before deleting it

When we invoke instance_->avrc_->Close(), it will invoke the callback in
AcceptorControlCb by the state machine from AVCT, and the iterator will
be deleted. Now we advanece the iterator first.

Bug: 169747177
Test: Connect to a speaker with AVRCP, and turn off Bluetooth
Tag: #stability
Change-Id: If4ed403d355242da48b7ee49dd74784f43de1b1d

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd am: 85991862d0
Treehugger Robot [Thu, 8 Oct 2020 00:30:10 +0000 (00:30 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd am: 85991862d0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452677

Change-Id: Id70f79b53adf11126dd523206d6bac5c1236718c

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd
Treehugger Robot [Thu, 8 Oct 2020 00:17:35 +0000 (00:17 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1452677

Change-Id: I173f7f20a996e9c2d4240cc88640578d763be1b2

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function"
Treehugger Robot [Thu, 8 Oct 2020 00:02:41 +0000 (00:02 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function"

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
Chris Manton [Tue, 22 Sep 2020 16:08:46 +0000 (09:08 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie0f33c905783981c92b06f5ea5718d49365200af

3 years agoMove btm_ble_increment_link_topology_mask l2c=>btm
Chris Manton [Tue, 22 Sep 2020 02:13:47 +0000 (19:13 -0700)]
Move btm_ble_increment_link_topology_mask l2c=>btm

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I683d68030531bbc635c5f357a8cc356d925d40c8

3 years agoStreamline conditional stack/btm/btm_ble::btm_ble_connected
Chris Manton [Tue, 22 Sep 2020 02:09:34 +0000 (19:09 -0700)]
Streamline conditional stack/btm/btm_ble::btm_ble_connected

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I908ff98f333e173762d25b1e6820db7a433af3af

3 years agoenum-ify tL2CAP_LE_RESULT_
Chris Manton [Mon, 5 Oct 2020 05:44:39 +0000 (22:44 -0700)]
enum-ify tL2CAP_LE_RESULT_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I0a6c26c962277607c5447619d64ce95b47a33311

3 years agoAdd api around select fields tL2C_CB::tL2C_LCB::
Chris Manton [Tue, 6 Oct 2020 17:37:29 +0000 (10:37 -0700)]
Add api around select fields tL2C_CB::tL2C_LCB::

tL2C_CB::tL2C_LCB::link_xmit_quota
tL2C_CB::tL2C_LCB::round_robin_unacked
tL2C_CB::tL2C_LCB::ble_round_robin_unacked
tL2C_CB::tL2C_LCB::acl_priority

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I392dac8bd8fb33cf8350a7fac1d160595c54ed1c

3 years agoenum-ify stack/include/l2c_api::L2CAP_PRIORITY_
Chris Manton [Tue, 6 Oct 2020 17:09:58 +0000 (10:09 -0700)]
enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I6d0f97493f407f1a4e32bc12434ec5c3c3b8ef54

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff am...
Jack He [Wed, 7 Oct 2020 21:19:14 +0000 (21:19 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff am: 8fd69eb58b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1451280

Change-Id: I10a3548277dd9969ab7fe12560284ce3cbfafa51

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e am: c16fc8dc97
Jack He [Wed, 7 Oct 2020 21:18:43 +0000 (21:18 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e am: c16fc8dc97

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1451112

Change-Id: I7d026884e221adc3b9985e3802febb6129c9bff5

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882 am:...
Jack He [Wed, 7 Oct 2020 21:18:31 +0000 (21:18 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882 am: 28ae01823d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449497

Change-Id: I8e65a4dcd4eb7d71052d958921078c0078fb8463

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff
Jack He [Wed, 7 Oct 2020 20:49:12 +0000 (20:49 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1451280

Change-Id: I8f74156d59c6c25c1a15b7bb6089a7433296e00a

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e
Jack He [Wed, 7 Oct 2020 20:48:49 +0000 (20:48 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1451112

Change-Id: I373e228f14c125ed864a809e0e87b41e92cb48f0

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882
Jack He [Wed, 7 Oct 2020 20:48:05 +0000 (20:48 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449497

Change-Id: Ie7a1952b5e3d425d6e4a36039dec05464f02f3ba

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:59 +0000 (20:26 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG"

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:51 +0000 (20:26 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG"

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging"
Jack He [Wed, 7 Oct 2020 20:25:40 +0000 (20:25 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging"

3 years agoshim/l2cap: Fix RegisterLECoc function
Łukasz Rymanowski [Fri, 2 Oct 2020 09:35:38 +0000 (09:35 +0000)]
shim/l2cap: Fix RegisterLECoc function

Change-Id: I6079b1456580f9f49aa18396177e2eef0d9e1398

3 years agoMerge "Implement encryption key size negotiation" am: 0baf4f2baf am: a479ac1efb
Jakub Pawlowski [Wed, 7 Oct 2020 07:58:39 +0000 (07:58 +0000)]
Merge "Implement encryption key size negotiation" am: 0baf4f2baf am: a479ac1efb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449336

Change-Id: I46fc66d9935247ba3bd05777b7f0b131d4e19502

3 years agoGD: Store peer keys in legacy format am: 7c1847ad0d am: 96dfd22e81
Jakub Pawlowski [Wed, 7 Oct 2020 07:58:29 +0000 (07:58 +0000)]
GD: Store peer keys in legacy format am: 7c1847ad0d am: 96dfd22e81

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446676

Change-Id: I6a6c76aaf94a3087c8cfb64bfd6b2f3e98332554

3 years agoMerge "Implement encryption key size negotiation" am: 0baf4f2baf
Jakub Pawlowski [Wed, 7 Oct 2020 07:56:51 +0000 (07:56 +0000)]
Merge "Implement encryption key size negotiation" am: 0baf4f2baf

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449336

Change-Id: I4dbfd5159eab0eaee9126a208b77d190dfaabfb3

3 years agoGD: Store peer keys in legacy format am: 7c1847ad0d
Jakub Pawlowski [Wed, 7 Oct 2020 07:44:35 +0000 (07:44 +0000)]
GD: Store peer keys in legacy format am: 7c1847ad0d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1446676

Change-Id: Ib4c4c14357f1dc6a4f3b2235b7a03946babe91dd

3 years agoMerge "Implement encryption key size negotiation"
Jakub Pawlowski [Wed, 7 Oct 2020 06:16:54 +0000 (06:16 +0000)]
Merge "Implement encryption key size negotiation"

3 years agoGD: Store peer keys in legacy format
Jakub Pawlowski [Thu, 1 Oct 2020 13:12:25 +0000 (15:12 +0200)]
GD: Store peer keys in legacy format

Bug: 142341141
Tag: #gd-refactor
Test: cert/run --host SecurityRecordStorageTest
Change-Id: I94d270da66977fef6356f011b649bb405d0c4324

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516 am: 2b733dc214
Jack He [Wed, 7 Oct 2020 00:00:43 +0000 (00:00 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516 am: 2b733dc214

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449401

Change-Id: Id0881eff74d6c0c7ce8650f323ba54c3621a9b5a

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 23:37:27 +0000 (23:37 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4 am: 75f78efd2f am: f07b30362d

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I4e82280def9bc7ad953ba8b727d29e62c809e279

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516
Jack He [Tue, 6 Oct 2020 23:31:45 +0000 (23:31 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449401

Change-Id: Ic5a9b79fff00f841e4a1ce81074525129340ae5f

3 years agoImplement encryption key size negotiation
Jakub Pawlowski [Mon, 5 Oct 2020 18:29:24 +0000 (20:29 +0200)]
Implement encryption key size negotiation

Bug: 142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_equal_to_max
Change-Id: I478d29cf20537075ef2a3dc9f707040e0b657ae1

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 23:20:11 +0000 (23:20 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4 am: 75f78efd2f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: Ie5f92538d13e353f7bdd68490e4f52c3d8274d9c

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO"
Jack He [Tue, 6 Oct 2020 22:56:19 +0000 (22:56 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO"

3 years agoGD-HCI: Change command and event logs from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:52:40 +0000 (15:52 -0700)]
GD-HCI: Change command and event logs from INFO to DEBUG

* So that they are not enabled by default

Bug: 164932634
Tag: #gd-refactor
Test: manual testing
Change-Id: I9ff67922b0305cd6397d497dccd038e0444a1d03

3 years agoGD-HCI: Change StopWatch log from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:23:28 +0000 (15:23 -0700)]
GD-HCI: Change StopWatch log from INFO to DEBUG

* So that it is disabled by default

Bug: 164973960
Test: manual testing
Tag: #gd-refactor
Change-Id: If65ff532621f53f9ccf554121d702c3c41da5a96

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 22:13:45 +0000 (22:13 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I1ed229afa0015de7ac4af6d417ec64fc1a74121e

3 years agoFix a security issue in sdp_server.cc
Hansong Zhang [Tue, 6 Oct 2020 21:48:27 +0000 (14:48 -0700)]
Fix a security issue in sdp_server.cc

Bug: 169342531
Test: POC
Change-Id: I0e8cdb9a00184f62d11fb06bc30f07b2a35bc49e

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 21:45:27 +0000 (21:45 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I6ccef29a5b8bbe61ad33317c1ff0add3e8f7927e

3 years ago[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312...
Xin Li [Tue, 6 Oct 2020 21:15:47 +0000 (21:15 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312 am: 064f2cd106 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 342cb328b6 is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449399

Change-Id: Ic74e7f30ed12c2f8e22338321832c9a14ec0dd47

3 years ago[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22...
The Android Open Source Project [Tue, 6 Oct 2020 21:15:42 +0000 (21:15 +0000)]
[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22d0 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 342cb328b6 is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449399

Change-Id: I63ddd1b3c81da071128e2db5ee4252d9817e9c1a

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 20:53:43 +0000 (20:53 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: Iaa69ebded8be2055cb9fee48d2d0b2e3ec8365cf

3 years agoMerge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312
Xin Li [Tue, 6 Oct 2020 20:24:35 +0000 (20:24 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449399

Change-Id: Ie5a10fc0a5ce58f2ee6494d5d8ee46b8f928873d

3 years agoDO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522
The Android Open Source Project [Tue, 6 Oct 2020 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1449399

Change-Id: If1877b2c672daaec5e8b8b5cb191ffd9621d96c0

3 years agoMerge "DO NOT MERGE - Merge RP1A.201005.006"
Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006"

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 20:16:04 +0000 (20:16 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12736109

Change-Id: I7d010b57ab226b166d9895d95101056b2f305d31

3 years agoMerge "bthal: Do not allow to initialize more than once" am: 38f08d2724 am: 7623685f83
Treehugger Robot [Tue, 6 Oct 2020 19:57:29 +0000 (19:57 +0000)]
Merge "bthal: Do not allow to initialize more than once" am: 38f08d2724 am: 7623685f83

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439972

Change-Id: I869b614734f1bf6d1218c48562cc38832cd76088