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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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_

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 8 Oct 2020 00:02:41 +0000 (00:02 +0000)]

Merge "shim/l2cap: Fix RegisterLECoc function"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

Jack He [Wed, 7 Oct 2020 20:26:51 +0000 (20:26 +0000)]

Merge "GD-HCI: Change StopWatch log from INFO to DEBUG"

commit | commitdiff | tree

Jack He [Wed, 7 Oct 2020 20:25:40 +0000 (20:25 +0000)]

Merge "GD-Logging: Add INIT flags to configure debug logging"

commit | commitdiff | tree

Łukasz Rymanowski [Fri, 2 Oct 2020 09:35:38 +0000 (09:35 +0000)]

shim/l2cap: Fix RegisterLECoc function

Change-Id: I6079b1456580f9f49aa18396177e2eef0d9e1398

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Wed, 7 Oct 2020 06:16:54 +0000 (06:16 +0000)]

Merge "Implement encryption key size negotiation"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jack He [Tue, 6 Oct 2020 22:56:19 +0000 (22:56 +0000)]

Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]

Merge "DO NOT MERGE - Merge RP1A.201005.006"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]

Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87

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

Change-Id: I1391cb656ed035aaec7beb0f2c11e5b3c008f4cc

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]

Properly shim controller flags am: 5a691a0901 am: 9b94d537b3

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

Change-Id: I0aa15516b04270a245ab066d8b98d367b498cc01

commit | commitdiff | tree

Jack He [Mon, 5 Oct 2020 23:38:37 +0000 (16:38 -0700)]

GD-Logging: Add INIT flags to configure debug logging

* Three flags:
- INIT_logging_debug_enabled_for_all
- INIT_logging_debug_enabled_for_tags
- INIT_logging_debug_disabled_for_tags
* If a tag is explicitly disabled or enabled, we will follow that
setting. Otherwise, we check the global enable flag
* This setup allows us to enable/disable individual tags as well as
enable or disable debug logging for all tags
* This affects only DEBUG and VERBOSE level logs

Bug: 170163727
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idb99ef1ca0a2d14c73069fcba396ac76a61ee39d

commit | commitdiff | tree

Jack He [Tue, 6 Oct 2020 05:50:55 +0000 (22:50 -0700)]

GD-Logging: Change LOG_DEBUG to LOG_INFO

* Given that LOG_DEBUG will be disabled by default,
changing existing LOG_DEBUG to LOG_INFO so that
we don't lose these logs

Bug: 170163727
Test: atest bluetooth_test_gd, manual device test
Tag: #gd-refactor
Change-Id: I84db7751d4bbe6d3ea88122b8cdf72bc150fbe7a

commit | commitdiff | tree

Treehugger Robot [Tue, 6 Oct 2020 18:53:54 +0000 (18:53 +0000)]

Merge "bthal: Do not allow to initialize more than once" am: 38f08d2724

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

Change-Id: Ie58c10ceec2164864233b3f0dd22c82b33373a42

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 18:52:42 +0000 (18:52 +0000)]

Properly shim controller flags am: 5a691a0901

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

Change-Id: I96b11a58c4ded5981fd79158618eae4b75824d13

commit | commitdiff | tree

Chen Chen [Tue, 6 Oct 2020 18:52:36 +0000 (18:52 +0000)]

Check Classic key before cross-key derivation am: 814160abca

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

Change-Id: I10b980c9f480dd9e2f2adb5af47cb23ff99421e6

commit | commitdiff | tree

Treehugger Robot [Tue, 6 Oct 2020 18:27:28 +0000 (18:27 +0000)]

Merge "bthal: Do not allow to initialize more than once"

commit | commitdiff | tree

Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]

Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix
Exempt-From-Owner-Approval: Already got owner approval,
but somehow it still shows no owner vote

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Oct 2020 04:00:27 +0000 (21:00 -0700)]

DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Change-Id: I1be981905f9b5c60b9fc0071200116a368996e00

commit | commitdiff | tree

TreeHugger Robot [Tue, 6 Oct 2020 10:11:36 +0000 (10:11 +0000)]

Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7 am: ace3e37d8c am: 1ef4307051

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

Change-Id: I74cdba16343747c9dacf22d29d38233478db9890

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:58 +0000 (09:40 +0000)]

Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am: 8bfbb8ba24 am: ec72bd5489

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

Change-Id: I22ca5b84ca1abbbe7f452fdb0af656ab850ff89e

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:55 +0000 (09:40 +0000)]

Legacy ACL shim interface am: 035379ba7d am: a86cb55518

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

Change-Id: I2e15a3779df045d8f1ed667213bd8a9b618bfa12

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:54 +0000 (09:40 +0000)]

Remove unused #defs stack/include/hcidefs am: 95f188f34a am: 3ec7e11fca

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

Change-Id: Id8093328dae6121e5b5c862a3029c177cfabee97

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:52 +0000 (09:40 +0000)]

Remove unused #defs stack/include/bt_types am: b96d27a064 am: 689e4b3b26

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

Change-Id: I564ad3d456e12138aa6bf1168eceaae059b0175c

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:49 +0000 (09:40 +0000)]

Remove unused var tBTM_SEC_DEV_REC::link_key_changed am: 593ddc1451 am: 0527033a36

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

Change-Id: I9f3434676f35963cb98601d92d2cdd21a4514bb2

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:47 +0000 (09:40 +0000)]

Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am: 9bc4e5285e am: f1b54f2778

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

Change-Id: If041b5cfa862e2b317dff7a37463fdd0d8f97164

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:44 +0000 (09:40 +0000)]

Add stack/include/bt_types::AddressTypeText am: 8d20e0414d am: 69d9a2ff82

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

Change-Id: I5da27bbb965bf3923f9746d72661a8021d558257

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:42 +0000 (09:40 +0000)]

Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 0b50fcee28 am: 45b5528677

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

Change-Id: I666630de7379a2c5639fc3b1817662430d732446

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:40 +0000 (09:40 +0000)]

Re-log stack/acl/btm_acl am: 4ec5ab73b0 am: b5ace3cfa1

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

Change-Id: I2ac11d38ff7d13838e5d4805393247e8b638ecd5

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:38 +0000 (09:40 +0000)]

Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1 am: 9b3ad0ca1d

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

Change-Id: Ic1c15ff98813ffc60d8115c1f707c11eb74fb91d

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:36 +0000 (09:40 +0000)]

Simplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c am: 0600c53de3

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

Change-Id: I2cec0f0a477f64f52df99e3cb8015b1ec886de33

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:40:33 +0000 (09:40 +0000)]

Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 95772843cb am: 1e73d70b45

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

Change-Id: Icb5e6edb270e391738db278375ea8fa579d6ff89

commit | commitdiff | tree

TreeHugger Robot [Tue, 6 Oct 2020 09:34:16 +0000 (09:34 +0000)]

Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7 am: ace3e37d8c

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

Change-Id: I431f6ba0eceff663fd358b8281ed462f4d0b0730

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:37 +0000 (09:04 +0000)]

Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am: 8bfbb8ba24

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

Change-Id: I7afeba21452f1df39a8a954449a6e57a30cb47db

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:33 +0000 (09:04 +0000)]

Legacy ACL shim interface am: 035379ba7d

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

Change-Id: Ia74a6217fcd7bcb1ff6bf983bae2d71b354862f3

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:29 +0000 (09:04 +0000)]

Remove unused #defs stack/include/hcidefs am: 95f188f34a

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

Change-Id: I7b6b15938feb86e90510997f5fcfd30d4b58ca8e

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:25 +0000 (09:04 +0000)]

Remove unused #defs stack/include/bt_types am: b96d27a064

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

Change-Id: Ic298f9707ecc60794a6345de458d95e5b1be803a

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:21 +0000 (09:04 +0000)]

Remove unused var tBTM_SEC_DEV_REC::link_key_changed am: 593ddc1451

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

Change-Id: I4ff7ad5f1fdfb8a02576f4ccf132d8b5fae6d0fb

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:17 +0000 (09:04 +0000)]

Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am: 9bc4e5285e

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

Change-Id: Ib576a2c869e8c9f630542167abc78a555a2bf578

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:13 +0000 (09:04 +0000)]

Add stack/include/bt_types::AddressTypeText am: 8d20e0414d

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

Change-Id: I7df1998d74f3a96d8e285b9c04fcede36d14ed58

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:09 +0000 (09:04 +0000)]

Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 0b50fcee28

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

Change-Id: Ibe8289128d4652458b3bb1b28272da51dfe24cc5

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:05 +0000 (09:04 +0000)]

Re-log stack/acl/btm_acl am: 4ec5ab73b0

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

Change-Id: Ia70167abb45e2b836aae8fe5b7033312aef3e386

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:04:01 +0000 (09:04 +0000)]

Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1

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

Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:03:58 +0000 (09:03 +0000)]

Simplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c

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

Change-Id: I2faf3cf4bac158baff419262060e9aee98bb6b4c

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 09:03:25 +0000 (09:03 +0000)]

Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 95772843cb

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

Change-Id: I4760a7d62ed76c895b14df6b8f5e44739428d02c

commit | commitdiff | tree

TreeHugger Robot [Tue, 6 Oct 2020 08:51:28 +0000 (08:51 +0000)]

Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7

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

Change-Id: If5f3d6fc4f8b7f93144459e45ca8588cf47cf1fa

commit | commitdiff | tree

TreeHugger Robot [Tue, 6 Oct 2020 08:34:08 +0000 (08:34 +0000)]

Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev

commit | commitdiff | tree

Chris Manton [Tue, 6 Oct 2020 00:32:51 +0000 (17:32 -0700)]

Properly shim controller flags

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I7d311bda8d86ca87032d8a45d35ab4d00a5d4038

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help