OSDN Git Service

android-x86/system-bt.git
4 years agoMerge "gd: Clean up bluetooth_test_gd" am: fbf6c3a408
Automerger Merge Worker [Fri, 21 Feb 2020 07:03:31 +0000 (07:03 +0000)]
Merge "gd: Clean up bluetooth_test_gd" am: fbf6c3a408

Change-Id: Ie1efcb167e5a50871452062473c23fd9e7f500e1

4 years agoMerge "gd: Clean up bluetooth_test_gd"
Treehugger Robot [Fri, 21 Feb 2020 06:49:47 +0000 (06:49 +0000)]
Merge "gd: Clean up bluetooth_test_gd"

4 years agoL2capTest: Migrate more test cases am: 22d38ed2b2
Automerger Merge Worker [Fri, 21 Feb 2020 06:14:01 +0000 (06:14 +0000)]
L2capTest: Migrate more test cases am: 22d38ed2b2

Change-Id: I848937eea9139d07dac82669c72e22d6ab0df00b

4 years agogd: Clean up bluetooth_test_gd
Chris Manton [Fri, 21 Feb 2020 03:58:43 +0000 (19:58 -0800)]
gd: Clean up bluetooth_test_gd

Bug: 146363362
Test: bluetooth_test_gd
Change-Id: I0f3fb81d2b79b781918d18ea89a3ed64574a9610

4 years agoL2capTest: Migrate more test cases
Hansong Zhang [Thu, 20 Feb 2020 23:44:02 +0000 (15:44 -0800)]
L2capTest: Migrate more test cases

And fix some logic

Test: cert/run_cert_facade_only.sh
Bug: 14987419
Change-Id: Id6780f788b88eb33025a08a9396af9a254548d31

4 years agoMerge "L2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject" am: d850e02cd1
Automerger Merge Worker [Fri, 21 Feb 2020 03:16:02 +0000 (03:16 +0000)]
Merge "L2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject" am: d850e02cd1

Change-Id: Ie18d208a5d6a5c51ef3379723adef9ab5fa1ecd2

4 years agoMerge "L2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject"
Ted Wang [Fri, 21 Feb 2020 02:54:59 +0000 (02:54 +0000)]
Merge "L2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject"

4 years agoMerge "L2capTest: Migrate basic ERTM test case" am: 0eb59918e8
Automerger Merge Worker [Fri, 21 Feb 2020 02:23:27 +0000 (02:23 +0000)]
Merge "L2capTest: Migrate basic ERTM test case" am: 0eb59918e8

Change-Id: I582b14b63ad79ecd0684ea7d57ca27a35f2504c8

4 years agoMerge "L2capTest: Migrate basic ERTM test case"
Treehugger Robot [Fri, 21 Feb 2020 02:10:31 +0000 (02:10 +0000)]
Merge "L2capTest: Migrate basic ERTM test case"

4 years agolink manager test am: 784b014dd2
Automerger Merge Worker [Fri, 21 Feb 2020 01:17:31 +0000 (01:17 +0000)]
link manager test am: 784b014dd2

Change-Id: I7753f1666e142b4391dc60f5e460df631045cd4b

4 years agolink manager test
Chris Manton [Thu, 20 Feb 2020 23:49:43 +0000 (15:49 -0800)]
link manager test

Clean up EXPECTs

Bug: 146363313
Test: bluetooth_test_gd # on device
Test: bluetooth_test_gd # native

Change-Id: I2398f46380207e4e996a5cf0a4a7ea9c6add9b22

4 years agoL2capTest: Migrate basic ERTM test case
Hansong Zhang [Thu, 20 Feb 2020 18:30:50 +0000 (10:30 -0800)]
L2capTest: Migrate basic ERTM test case

And fixed the logic in control packet handler

Test: cert/run_cert_facade_only.sh
Bug: 14987419
Change-Id: Ibd7592c749350a4ac694586cff2bb37295e4c398

4 years agoMerge "Fix call order for BTM shim RegisterInquiryCallbacks" am: e52ed0c24a
Automerger Merge Worker [Thu, 20 Feb 2020 19:21:23 +0000 (19:21 +0000)]
Merge "Fix call order for BTM shim RegisterInquiryCallbacks" am: e52ed0c24a

Change-Id: I37c85867221cef521b8a4583e477ebd98a7d64e9

4 years agoMerge "Fix call order for BTM shim RegisterInquiryCallbacks"
Treehugger Robot [Thu, 20 Feb 2020 19:07:46 +0000 (19:07 +0000)]
Merge "Fix call order for BTM shim RegisterInquiryCallbacks"

4 years agoOH MY COD! Why is gabledorsche plural? am: b0c306434c
Automerger Merge Worker [Thu, 20 Feb 2020 18:42:06 +0000 (18:42 +0000)]
OH MY COD! Why is gabledorsche plural? am: b0c306434c

Change-Id: I49af56102828d1f8355fcc364007598d5b39b46c

4 years agoOH MY COD! Why is gabledorsche plural?
Zach Johnson [Thu, 20 Feb 2020 17:50:48 +0000 (09:50 -0800)]
OH MY COD! Why is gabledorsche plural?

Link to a helpful explanation on why gabeldorsche and not gabeldorsch.

Change-Id: I978ac9ba88de0be42a3dde76eafeeca59b26b50e

4 years agoMerge changes Id1de1279,I4fb13f4b,I1f27fffa,I6f650623 am: 5e6c2a258e
Automerger Merge Worker [Thu, 20 Feb 2020 16:57:43 +0000 (16:57 +0000)]
Merge changes Id1de1279,I4fb13f4b,I1f27fffa,I6f650623 am: 5e6c2a258e

Change-Id: I2e60fc8e7664deed2a0ff2b9323ff4087a008033

4 years agoFix call order for BTM shim RegisterInquiryCallbacks
Jakub Pawlowski [Thu, 20 Feb 2020 16:49:32 +0000 (17:49 +0100)]
Fix call order for BTM shim RegisterInquiryCallbacks

This currently causes crash on bringup of GD stack

Bug: 149757450
Test: start stack with GD enabled
Change-Id: Ie86d007dd9fcbab102b7c1e95c97ae5d9989fa29

4 years agoMerge changes Id1de1279,I4fb13f4b,I1f27fffa,I6f650623
Treehugger Robot [Thu, 20 Feb 2020 16:42:37 +0000 (16:42 +0000)]
Merge changes Id1de1279,I4fb13f4b,I1f27fffa,I6f650623

* changes:
  Get rid of HciLayer shim
  Prepare to remove HCI layer shim
  Get rid of Advertising shim
  Get rid of Inquiry shim

4 years agoMerge "L2capTest: Add common event handler and migrate test case" am: b1e79a61ea
Automerger Merge Worker [Thu, 20 Feb 2020 04:58:30 +0000 (04:58 +0000)]
Merge "L2capTest: Add common event handler and migrate test case" am: b1e79a61ea

Change-Id: Ic95551ec4dabfdddb91a8820df7b195c8a086709

4 years agoMerge "L2capTest: Add common event handler and migrate test case"
Treehugger Robot [Thu, 20 Feb 2020 04:48:28 +0000 (04:48 +0000)]
Merge "L2capTest: Add common event handler and migrate test case"

4 years agoMerge "L2CAP Cert with facade only initial commit" am: b0ab9e0212
Automerger Merge Worker [Thu, 20 Feb 2020 04:22:06 +0000 (04:22 +0000)]
Merge "L2CAP Cert with facade only initial commit" am: b0ab9e0212

Change-Id: I9cfdd9dca60a7dc6fd9429c0d6bf6c958b4c0ec1

4 years agoMerge "L2CAP Cert with facade only initial commit"
Treehugger Robot [Thu, 20 Feb 2020 04:03:39 +0000 (04:03 +0000)]
Merge "L2CAP Cert with facade only initial commit"

4 years agoL2capTest: Add common event handler and migrate test case
Hansong Zhang [Thu, 20 Feb 2020 01:25:41 +0000 (17:25 -0800)]
L2capTest: Add common event handler and migrate test case

Migrated L2cap tests to use facade only:
test_disconnect_on_timeout
test_respond_to_echo_request
test_reject_unknown_command

Test: cert/run_cert_facade_only.sh
Bug: 14987419
Change-Id: I809a95fbf148f3784377d05e630e69539f8f93ef

4 years agoMerge changes from topic "bt-avrcp-controller-cover-art" am: 4ce0b8f495
Automerger Merge Worker [Thu, 20 Feb 2020 02:18:29 +0000 (02:18 +0000)]
Merge changes from topic "bt-avrcp-controller-cover-art" am: 4ce0b8f495

Change-Id: Id14c4c0a7b86e03e9eee261b961d632e5ead06cb

4 years agoAdd cover artwork image handles to requested attributes objects am: 9b8db5c699
Automerger Merge Worker [Thu, 20 Feb 2020 02:18:27 +0000 (02:18 +0000)]
Add cover artwork image handles to requested attributes objects am: 9b8db5c699

Change-Id: If0160fafb9a047e22f608ba13c37058230b3cbf2

4 years agoFind cover art supported feature and send up to JNI am: 4cc3fbcd9f
Automerger Merge Worker [Thu, 20 Feb 2020 02:18:25 +0000 (02:18 +0000)]
Find cover art supported feature and send up to JNI am: 4cc3fbcd9f

Change-Id: I52ae2bcc01fa792d084426527c13a4d08e087be6

4 years agoIndicate support for controller cover art feature in SDP record am: 82d74bb88b
Automerger Merge Worker [Thu, 20 Feb 2020 02:18:22 +0000 (02:18 +0000)]
Indicate support for controller cover art feature in SDP record am: 82d74bb88b

Change-Id: Ib6e36401885a8b22435d3a8a2b90a842c9b5c055

4 years agoL2CAP Cert with facade only initial commit
Hansong Zhang [Wed, 12 Feb 2020 00:25:37 +0000 (16:25 -0800)]
L2CAP Cert with facade only initial commit

Test: cert/run_cert_facade_only.sh
Bug: 149874197
Change-Id: I2ec34c19ee609ac8ef4f4da4cc8a9d66b6977543

4 years agoMerge changes from topic "bt-avrcp-controller-cover-art"
Sal Savage [Thu, 20 Feb 2020 02:02:31 +0000 (02:02 +0000)]
Merge changes from topic "bt-avrcp-controller-cover-art"

* changes:
  Find and capture cover art BIP PSM and send it to Java/JNI
  Add cover artwork image handles to requested attributes objects
  Find cover art supported feature and send up to JNI
  Indicate support for controller cover art feature in SDP record

4 years agoAdd LeAclManagerTest, SimpleSecurityTest to dist am: 81616d0cbc
Automerger Merge Worker [Thu, 20 Feb 2020 01:42:40 +0000 (01:42 +0000)]
Add LeAclManagerTest, SimpleSecurityTest to dist am: 81616d0cbc

Change-Id: Ibecade6790b062509b6eac39cd581e6af8f7a454

4 years agoAdd LeAclManagerTest, SimpleSecurityTest to dist
Hansong Zhang [Wed, 19 Feb 2020 22:22:32 +0000 (14:22 -0800)]
Add LeAclManagerTest, SimpleSecurityTest to dist

Test: m dist bluetooth_stack_with_facade
Change-Id: Icb8922b2432c9e02b9a231614051d4b9573ce3b2

4 years agoMerge "Swap Cert and DUT index" am: 6bfb454e2d
Automerger Merge Worker [Thu, 20 Feb 2020 01:19:18 +0000 (01:19 +0000)]
Merge "Swap Cert and DUT index" am: 6bfb454e2d

Change-Id: Ibdd5491e4655e6080220a38e90bc479d55c76c98

4 years agoMerge "Swap Cert and DUT index"
Treehugger Robot [Thu, 20 Feb 2020 01:03:36 +0000 (01:03 +0000)]
Merge "Swap Cert and DUT index"

4 years agoGet rid of HciLayer shim
Jakub Pawlowski [Thu, 20 Feb 2020 00:25:54 +0000 (01:25 +0100)]
Get rid of HciLayer shim

Bug: 149757450
Change-Id: Id1de12794f3378301442dfab01e3857a5d1c9459

4 years agoPrepare to remove HCI layer shim
Jakub Pawlowski [Wed, 19 Feb 2020 23:09:52 +0000 (00:09 +0100)]
Prepare to remove HCI layer shim

Bug: 149757450
Change-Id: I4fb13f4b7d9a80540ce683eb13bf0e6da39b9fe6

4 years agoGet rid of Advertising shim
Jakub Pawlowski [Wed, 19 Feb 2020 20:16:57 +0000 (21:16 +0100)]
Get rid of Advertising shim

Bug: 149757450
Change-Id: I1f27fffa5aca3bed420c9bfe4e1bb404460f3ffc

4 years agoGet rid of Inquiry shim
Jakub Pawlowski [Wed, 19 Feb 2020 19:13:15 +0000 (20:13 +0100)]
Get rid of Inquiry shim

Bug: 149757450
Change-Id: I6f650623e7f89ed8c75e0f4ddadc218c7f3c8b3c

4 years agoGet rid of Name shim am: b1e35587bd
Automerger Merge Worker [Wed, 19 Feb 2020 22:25:02 +0000 (22:25 +0000)]
Get rid of Name shim am: b1e35587bd

Change-Id: Iae6613471e5fa608adc27e02635199cba0b21703

4 years agoMerge "HCI: Remove unused ClassicSecurityManager API" am: a76465a4db
Automerger Merge Worker [Wed, 19 Feb 2020 22:22:19 +0000 (22:22 +0000)]
Merge "HCI: Remove unused ClassicSecurityManager API" am: a76465a4db

Change-Id: I61b722b00b5faa497fc09ec3b25760deb695b6c2

4 years agoGet rid of Name shim
Jakub Pawlowski [Wed, 19 Feb 2020 17:19:07 +0000 (18:19 +0100)]
Get rid of Name shim

Bug: 149757450
Change-Id: Ie273f88a1fa27a8fa6f748abcf864b080591cdaa

4 years agoMerge "Get rid of NameDB shim" am: 12b53ca6e4
Automerger Merge Worker [Wed, 19 Feb 2020 22:14:45 +0000 (22:14 +0000)]
Merge "Get rid of NameDB shim" am: 12b53ca6e4

Change-Id: Ia2767daa0f91e7cec1f588a2f57dc17925e65068

4 years agoMerge "HCI: Remove unused ClassicSecurityManager API"
Treehugger Robot [Wed, 19 Feb 2020 21:42:35 +0000 (21:42 +0000)]
Merge "HCI: Remove unused ClassicSecurityManager API"

4 years agoSwap Cert and DUT index
Hansong Zhang [Wed, 19 Feb 2020 21:19:07 +0000 (13:19 -0800)]
Swap Cert and DUT index

Cert is 0, DUT is 1

Test: cert/run_cert_facade_only.sh
Change-Id: I76231b8cbdb03e2f3a998c82eac859363a9da0d8

4 years agoMerge "Get rid of NameDB shim"
Treehugger Robot [Wed, 19 Feb 2020 21:06:12 +0000 (21:06 +0000)]
Merge "Get rid of NameDB shim"

4 years agoMerge "SM: Add JustWorks cert tests" am: 3454e8112b
Automerger Merge Worker [Wed, 19 Feb 2020 20:19:48 +0000 (20:19 +0000)]
Merge "SM: Add JustWorks cert tests" am: 3454e8112b

Change-Id: Ica95b8f8eaa208f1c9505dac2f7cff742dd7e60e

4 years agoMerge "SM: Add JustWorks cert tests"
Treehugger Robot [Wed, 19 Feb 2020 20:10:06 +0000 (20:10 +0000)]
Merge "SM: Add JustWorks cert tests"

4 years agoMerge "AVRCP Controller manage active device" am: 635ce2b78c
Automerger Merge Worker [Wed, 19 Feb 2020 19:48:02 +0000 (19:48 +0000)]
Merge "AVRCP Controller manage active device" am: 635ce2b78c

Change-Id: Id55f180e199df2b6bd7b24d611435829c779a437

4 years agoMerge "AVRCP Controller manage active device"
Joseph Pirozzo [Wed, 19 Feb 2020 19:15:11 +0000 (19:15 +0000)]
Merge "AVRCP Controller manage active device"

4 years agoMerge changes from topic "gd_sm_ui_wiring" am: 0183d4ea0f
Automerger Merge Worker [Wed, 19 Feb 2020 18:44:06 +0000 (18:44 +0000)]
Merge changes from topic "gd_sm_ui_wiring" am: 0183d4ea0f

Change-Id: I6f1a3fa694db92e81cae63a18253ac19c5dee5a6

4 years agoMerge "Remove redundant BTA_AR_DEBUG define" am: 7a577708f1
Automerger Merge Worker [Wed, 19 Feb 2020 18:43:46 +0000 (18:43 +0000)]
Merge "Remove redundant BTA_AR_DEBUG define" am: 7a577708f1

Change-Id: Iec376f4931b3c0e8d2b4c7961a77959007c4b0ec

4 years agoMerge changes from topic "gd_sm_ui_wiring"
Treehugger Robot [Wed, 19 Feb 2020 18:36:17 +0000 (18:36 +0000)]
Merge changes from topic "gd_sm_ui_wiring"

* changes:
  SM: Add UI Callbacks to CPH
  Security UI Callbacks wiring

4 years agoMerge "Remove redundant BTA_AR_DEBUG define"
Treehugger Robot [Wed, 19 Feb 2020 18:29:56 +0000 (18:29 +0000)]
Merge "Remove redundant BTA_AR_DEBUG define"

4 years agoGet rid of Scanning shim am: 0572c66dce
Automerger Merge Worker [Wed, 19 Feb 2020 18:00:15 +0000 (18:00 +0000)]
Get rid of Scanning shim am: 0572c66dce

Change-Id: I227bb43dd0b9e8ed611c01f17238ddab29faa7db

4 years agoGet rid of NameDB shim
Jakub Pawlowski [Wed, 19 Feb 2020 16:30:32 +0000 (17:30 +0100)]
Get rid of NameDB shim

Bug: 149757450
Change-Id: I7d34028f71d333b8b12a8f8a3d164df365d66de5

4 years agoGet rid of Scanning shim
Jakub Pawlowski [Wed, 19 Feb 2020 06:57:14 +0000 (07:57 +0100)]
Get rid of Scanning shim

Bug: 149757450
Change-Id: I8f41bb6d79324bab6dbe40ea5223f42431c57638

4 years agoMerge "L2CAP: Add test scripts for pts test" am: 494741c327
Automerger Merge Worker [Wed, 19 Feb 2020 11:28:46 +0000 (11:28 +0000)]
Merge "L2CAP: Add test scripts for pts test" am: 494741c327

Change-Id: I0f126f962308d008367b3cf5f2e5065c027ce6ab

4 years agoMerge "L2CAP: Update remote tx_window during channel configuration" am: 5d6e66667f
Automerger Merge Worker [Wed, 19 Feb 2020 11:28:39 +0000 (11:28 +0000)]
Merge "L2CAP: Update remote tx_window during channel configuration" am: 5d6e66667f

Change-Id: Ic828fab6c996298a375bfdfe208c7c85bbfac916

4 years agoMerge "L2CAP: Add test scripts for pts test"
Treehugger Robot [Wed, 19 Feb 2020 11:13:17 +0000 (11:13 +0000)]
Merge "L2CAP: Add test scripts for pts test"

4 years agoMerge "L2CAP: Update remote tx_window during channel configuration"
Treehugger Robot [Wed, 19 Feb 2020 11:12:59 +0000 (11:12 +0000)]
Merge "L2CAP: Update remote tx_window during channel configuration"

4 years agoRemove redundant BTA_AR_DEBUG define
Cheney Ni [Wed, 19 Feb 2020 09:19:27 +0000 (17:19 +0800)]
Remove redundant BTA_AR_DEBUG define

Bug: none
Test: compile
Change-Id: Id63e2f9a8881c16b2b48eeef2b941f7c0cde628b

4 years agoSM: Add JustWorks cert tests
Martin Brabham [Fri, 14 Feb 2020 02:09:23 +0000 (18:09 -0800)]
SM: Add JustWorks cert tests

Add some classic JustWorks use cases as cert tests.

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: I56a1ba5fb42a97e8b87e5f8d87722a93bba0f08f

4 years agoHCI: Remove unused ClassicSecurityManager API
Martin Brabham [Thu, 13 Feb 2020 19:14:35 +0000 (11:14 -0800)]
HCI: Remove unused ClassicSecurityManager API

Bug: 146363467
Test: bluetooth_test_gd
Change-Id: Ib8994f858161ce0ba5143cef49da755f5f5599df

4 years agoSM: Add UI Callbacks to CPH
Martin Brabham [Wed, 19 Feb 2020 05:16:52 +0000 (21:16 -0800)]
SM: Add UI Callbacks to CPH

Test: bluetooth_test_gd
Change-Id: I8b7b587f720a897e416ed3abea0fde6ad6788338

4 years agoSecurity UI Callbacks wiring
Jakub Pawlowski [Fri, 14 Feb 2020 00:03:31 +0000 (01:03 +0100)]
Security UI Callbacks wiring

Test: bluetooth_test_gd
Change-Id: I713e4efd923359a36fc943362d59ae619dd515ca

4 years agoMerge "Fix crash at unexpected code after root inflammation" am: 25eebf94e4
Automerger Merge Worker [Wed, 19 Feb 2020 03:54:24 +0000 (03:54 +0000)]
Merge "Fix crash at unexpected code after root inflammation" am: 25eebf94e4

Change-Id: I5c7ba87ef0b756479de0d841b399264e198ae801

4 years agoGet rid of Storage shim am: f003375582
Automerger Merge Worker [Wed, 19 Feb 2020 03:53:43 +0000 (03:53 +0000)]
Get rid of Storage shim am: f003375582

Change-Id: I4185594bc85e8e1b9c09d333cc81923a2abc6dbe

4 years agoMerge "Fix crash at unexpected code after root inflammation"
Treehugger Robot [Wed, 19 Feb 2020 03:32:11 +0000 (03:32 +0000)]
Merge "Fix crash at unexpected code after root inflammation"

4 years agoGet rid of Connectability shim am: 59ee73d6f6
Automerger Merge Worker [Wed, 19 Feb 2020 02:59:47 +0000 (02:59 +0000)]
Get rid of Connectability shim am: 59ee73d6f6

Change-Id: Ic1182de6abb09efcfd17beaa35000d2bf48c1dd2

4 years agoGet rid of Storage shim
Jakub Pawlowski [Wed, 19 Feb 2020 01:29:20 +0000 (02:29 +0100)]
Get rid of Storage shim

Bug: 149757450
Change-Id: I90130121c5fdf23ec8cacf19fedd4b3e154351a5

4 years agoGet rid of Page shim am: 3918151998
Automerger Merge Worker [Wed, 19 Feb 2020 00:59:39 +0000 (00:59 +0000)]
Get rid of Page shim am: 3918151998

Change-Id: I0a4ad1c3cd9bf6eb9b73ef9285ca1f311ee537d3

4 years agoGet rid of Security shim am: c3a2419e8c
Automerger Merge Worker [Wed, 19 Feb 2020 00:59:35 +0000 (00:59 +0000)]
Get rid of Security shim am: c3a2419e8c

Change-Id: I3b588c5d5fa641372e0edca4a76d0ca8d3458149

4 years agoGet rid of Connectability shim
Jakub Pawlowski [Wed, 19 Feb 2020 00:17:53 +0000 (01:17 +0100)]
Get rid of Connectability shim

Bug: 149757450
Change-Id: Idef691e97109e2634fc05fc7bddfeca72b967d11

4 years agosmp_generate_stk: reduce log level for key type information am: f00a504ccf
Automerger Merge Worker [Tue, 18 Feb 2020 22:51:52 +0000 (22:51 +0000)]
smp_generate_stk: reduce log level for key type information am: f00a504ccf

Change-Id: Ie946c3e56499acb557ed45ab57559501ba71ec52

4 years agoGet rid of Page shim
Jakub Pawlowski [Tue, 18 Feb 2020 22:46:00 +0000 (23:46 +0100)]
Get rid of Page shim

Bug: 149757450
Change-Id: I9ce812831a0d8ff62772ea5b98ab4a7e646b162a

4 years agoGet rid of Security shim
Jakub Pawlowski [Tue, 18 Feb 2020 19:39:33 +0000 (20:39 +0100)]
Get rid of Security shim

Bug: 149757450
Change-Id: Id7137d64059cf5d15cd94419255c4b1f051bee60

4 years agosmp_generate_stk: reduce log level for key type information
Jakub Pawlowski [Tue, 18 Feb 2020 16:20:25 +0000 (17:20 +0100)]
smp_generate_stk: reduce log level for key type information

Change-Id: I7499a3f507914db9cb9c062f4ad9cfccdb51f06b

4 years agoMerge "gd: Unregister events at the hci layer" am: a9b293a12e
Automerger Merge Worker [Tue, 18 Feb 2020 22:18:25 +0000 (22:18 +0000)]
Merge "gd: Unregister events at the hci layer" am: a9b293a12e

Change-Id: I1988e7499fb7afb49f817cd5e233cf5f92aa04d7

4 years agoMerge "Save bonding and pairing state to security record" am: 547f0eac23
Automerger Merge Worker [Tue, 18 Feb 2020 22:18:16 +0000 (22:18 +0000)]
Merge "Save bonding and pairing state to security record" am: 547f0eac23

Change-Id: I55a2a59ccd16a1716fa65be8590a0224c9de400e

4 years agoMerge "gd: Unregister events at the hci layer"
Treehugger Robot [Tue, 18 Feb 2020 22:17:29 +0000 (22:17 +0000)]
Merge "gd: Unregister events at the hci layer"

4 years agoMerge "Save bonding and pairing state to security record"
Treehugger Robot [Tue, 18 Feb 2020 22:08:18 +0000 (22:08 +0000)]
Merge "Save bonding and pairing state to security record"

4 years agoGet rid of Discoverability shim am: a71658fa0f
Automerger Merge Worker [Tue, 18 Feb 2020 21:48:18 +0000 (21:48 +0000)]
Get rid of Discoverability shim am: a71658fa0f

Change-Id: I30224c9af5eefa1c7b8b8faa36c3a3b049584ee7

4 years agoGet rid of the redundant shim interfaces am: c73a895fa2
Automerger Merge Worker [Tue, 18 Feb 2020 21:47:56 +0000 (21:47 +0000)]
Get rid of the redundant shim interfaces am: c73a895fa2

Change-Id: I68abdaf9b3e0601278c0497a581248bc0d85b034

4 years agoGet rid of Discoverability shim
Jakub Pawlowski [Tue, 18 Feb 2020 18:40:52 +0000 (19:40 +0100)]
Get rid of Discoverability shim

Bug: 149757450
Change-Id: Ibe6cccc0971d4a723ba5489332ca7933e7609a34

4 years agoCanonicalize header include files am: 6a03ea25f6
Chris Manton [Tue, 18 Feb 2020 21:09:55 +0000 (21:09 +0000)]
Canonicalize header include files am: 6a03ea25f6

Change-Id: I858a0ddbc1f44d099d79ef117b82ccdd0cc4ae29

4 years agoGet rid of the redundant shim interfaces
Jakub Pawlowski [Sun, 16 Feb 2020 00:03:04 +0000 (01:03 +0100)]
Get rid of the redundant shim interfaces

It was agred to expose gd types into the system/bt/main folder.
All the interfaces already use pimpl pattern to make them testable.
Thus there is no need for the I* shim interfaces.

Test: updated tests
Bug: 149757450
Change-Id: I9662f9ab48c61b764e4df082da1a73483cb0b2b9

4 years agoSave bonding and pairing state to security record
Chris Manton [Tue, 11 Feb 2020 23:49:14 +0000 (15:49 -0800)]
Save bonding and pairing state to security record

Bug: 142341141
Test: bluetooth_test_gd

Change-Id: I226d9f2f74e12d911fbb8e1f3d5924db7763bdaf

4 years agoCanonicalize header include files
Chris Manton [Tue, 18 Feb 2020 19:20:31 +0000 (11:20 -0800)]
Canonicalize header include files

Bug: 147316415
Test: Compiles and Builds
Change-Id: I00316dba9cce8d727fc718250237e80ff87cdd00

4 years agoDo not redefine logging if already defined am: 183a1b0864
Jakub Pawlowski [Tue, 18 Feb 2020 17:30:04 +0000 (17:30 +0000)]
Do not redefine logging if already defined am: 183a1b0864

Change-Id: I6828c8f46b443af245622195c51aff5dfe0da684

4 years agoDo not redefine logging if already defined
Jakub Pawlowski [Sat, 15 Feb 2020 21:41:02 +0000 (22:41 +0100)]
Do not redefine logging if already defined

This patch lets us include gd code in system/bt/main. Currently if we
were to do that, we would get errors about logs being redefined.

Test: compilation
Change-Id: Ifc2c9eb913c311a50763a26f864dd91872c273cc

4 years agoMerge "gd: Add shim access to name db" am: 8962199fe6
Treehugger Robot [Tue, 18 Feb 2020 17:25:26 +0000 (17:25 +0000)]
Merge "gd: Add shim access to name db" am: 8962199fe6

Change-Id: I928f178c55ccebfad626442f7ddfcbb0e3f6f635

4 years agoMerge "gd: Add shim access to name db"
Treehugger Robot [Tue, 18 Feb 2020 17:06:36 +0000 (17:06 +0000)]
Merge "gd: Add shim access to name db"

4 years agoModify service_type constants to not collide with constants in GD am: 17799fd1ec
Jakub Pawlowski [Tue, 18 Feb 2020 05:45:35 +0000 (05:45 +0000)]
Modify service_type constants to not collide with constants in GD am: 17799fd1ec

Change-Id: I2bb623c33fc622060078e3700cdbe56b8d8ec0c7

4 years agoModify service_type constants to not collide with constants in GD
Jakub Pawlowski [Sat, 15 Feb 2020 17:46:38 +0000 (18:46 +0100)]
Modify service_type constants to not collide with constants in GD

Test: compilation
Change-Id: Ieb9540a3c5ca390a1e04d20ae378d1ab06b33707

4 years agoL2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject
Ted Wang [Mon, 17 Feb 2020 05:57:50 +0000 (13:57 +0800)]
L2CAP: Add test case for TSPC_L2CAP_2_7 Can Sent Reject

Add following cert test in simple_l2cap_test:
  test_send_rej [L2CAP/ERM/BV-16-C]

Add following test case in pts_l2cap_test:
  test_L2CAP_ERM_BV_16_C

Bug: 149658425
Test: run_cert.sh
Change-Id: I4f160883d47d2294f88d98177813ec587a8c2e76

4 years agoL2CAP: Add test scripts for pts test
Ted Wang [Thu, 30 Jan 2020 06:16:05 +0000 (14:16 +0800)]
L2CAP: Add test scripts for pts test

Add following PTS test scripts:
  L2CAP/EXF/BV-01-C
  L2CAP/CMC/BV-01-C
  L2CAP/CMC/BV-02-C
  L2CAP/ERM/BV-01-C
  L2CAP/ERM/BV-02-C
  L2CAP/ERM/BV-03-C
  L2CAP/ERM/BV-08-C
  L2CAP/ERM/BV-09-C
  L2CAP/ERM/BV-10-C
  L2CAP/ERM/BV-11-C
  L2CAP/ERM/BV-18-C
  L2CAP/ERM/BV-19-C
  L2CAP/ERM/BV-20-C

Add cert tests:
  test_initiated_configurtion_ertm [L2CAP/CMC/BV-01-C]
  test_receive_i_frames [L2CAP/ERM/BV-02-C]
  test_acknowledging_received_i_frames [L2CAP/ERM/BV-03-C]
  test_transmit_s_frame_rr_with_poll_bit_set [L2CAP/ERM/BV-08-C]
  test_transmit_s_frame_rr_with_final_bit_set [L2CAP/ERM/BV-09-C]
  test_receive_s_frame_rr_final_bit_set [L2CAP/ERM/BV-18-C]
  test_receive_i_frame_final_bit_set [L2CAP/ERM/BV-19-C]
  test_recieve_rnr [L2CAP/ERM/BV-20-C]

Bug: 145784332
Test: run_cert.sh
Change-Id: If5b25880f731dbfbb0447a6edaccbbf3d8829d11

4 years agoL2CAP: Update remote tx_window during channel configuration
Ted Wang [Mon, 10 Feb 2020 06:28:48 +0000 (14:28 +0800)]
L2CAP: Update remote tx_window during channel configuration

* Update tx_window as transmit window in configuration request from
  remote.
* Fix logic of checking valid f bit, f bit should be valid only if:
  1. tx_state is in XMIT and f not set
  2. tx_state is in WAIT_F and f set to POLL_RESPONSE

* Add follwoing test cases in simple_l2cap_cert:
  test_resume_transmitting_when_received_rr
  test_resume_transmitting_when_acknowledge_previously_sent
  test_respond_to_rej
  test_handle_duplicate_srej
  test_handle_Receipt_rej_and_rr_with_f_set
  test_handle_rej_and_i_frame_with_f_set

* Add following test case in pts_l2cap_test:
  test_L2CAP_ERM_BV_05_C
  test_L2CAP_ERM_BV_06_C
  test_L2CAP_ERM_BV_13_C
  test_L2CAP_ERM_BI_03_C
  test_L2CAP_ERM_BI_04_C
  test_L2CAP_ERM_BI_05_C

Bug: 149182548
Test: run_cert.sh
Change-Id: I0828e570017b954980f23912937e36524814a0f6

4 years agogd: Unregister events at the hci layer
Chris Manton [Sat, 15 Feb 2020 04:32:51 +0000 (20:32 -0800)]
gd: Unregister events at the hci layer

bt_headless with the pairing option fails

Bug:149524116
Test: blueooth_test_gd
Test: bt_headless
Change-Id: I65d9f928c6ff63e5ddde8380cae847d180876fac

4 years agoMerge "PDL: Serialize nested packets in Python" am: ea2f6e05e0
Treehugger Robot [Sat, 15 Feb 2020 02:35:23 +0000 (02:35 +0000)]
Merge "PDL: Serialize nested packets in Python" am: ea2f6e05e0

Change-Id: Ifbf92b4233acac09da55a01ce697148d3a957cf0

4 years agoMerge "PDL: Serialize nested packets in Python"
Treehugger Robot [Sat, 15 Feb 2020 02:26:22 +0000 (02:26 +0000)]
Merge "PDL: Serialize nested packets in Python"