OSDN Git Service

android-x86/system-bt.git
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 "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 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 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 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"

4 years agoMerge changes Iea352d4b,Ic0737465 am: 91a57b0601
Treehugger Robot [Fri, 14 Feb 2020 21:48:47 +0000 (21:48 +0000)]
Merge changes Iea352d4b,Ic0737465 am: 91a57b0601

Change-Id: Ibb4cbc8cea43fbab1219763a5bd73b4970c5071b

4 years agoMerge changes Iea352d4b,Ic0737465
Treehugger Robot [Fri, 14 Feb 2020 21:33:33 +0000 (21:33 +0000)]
Merge changes Iea352d4b,Ic0737465

* changes:
  GRPC: Use server_stream_call.cancelled() instead of hidden API
  RootCanal HAL: Fixed race condition when tearing down rootcanal HAL

4 years agoPDL: Serialize nested packets in Python
Myles Watson [Sat, 4 Jan 2020 00:30:27 +0000 (16:30 -0800)]
PDL: Serialize nested packets in Python

Bug: 148096951
Test: ./cert/run_cert_facade_only.sh
Change-Id: I2c54bb5d35dec9a9b5101165d2d1ccb22b116ef4

4 years agoFix crash at unexpected code after root inflammation
Ugo Yu [Wed, 12 Feb 2020 06:04:11 +0000 (14:04 +0800)]
Fix crash at unexpected code after root inflammation

* Clean up the hci/startup timers after the receiving of root
  inflammation packet so they will not be scheduled again and
  expire before the abort_timer.
* Abort Bluetooth when HAL is dead with correct reason.

Bug: 144592765
Test: Manual
Change-Id: I1458defeebaac7951aa8c7f52decf5b6ca3ab4fc

4 years agogd: Add shim access to name db
Chris Manton [Fri, 14 Feb 2020 00:19:05 +0000 (16:19 -0800)]
gd: Add shim access to name db

Provides replacement for remote name request db
for legacy shim side.

Bug: 149524116
Test: bluetooth_test_gd

Change-Id: I69c8c65c01935ae371debedcef2d921cea7beb4a

4 years agoMerge "Use mobly.asserts" am: 4cc2f58735
Treehugger Robot [Fri, 14 Feb 2020 06:38:18 +0000 (06:38 +0000)]
Merge "Use mobly.asserts" am: 4cc2f58735

Change-Id: Ie314bb67a9ba877d0bfbd1fe18182056f2b9214f

4 years agoMerge "Use mobly.asserts"
Treehugger Robot [Fri, 14 Feb 2020 06:23:06 +0000 (06:23 +0000)]
Merge "Use mobly.asserts"

4 years agoMerge "gd: Authenticate only if necessary" am: fac9feea44
Treehugger Robot [Fri, 14 Feb 2020 05:45:15 +0000 (05:45 +0000)]
Merge "gd: Authenticate only if necessary" am: fac9feea44

Change-Id: I594acbaa864f5683f05fc5ab2402a34fbd58839d

4 years agoMerge "gd: Authenticate only if necessary"
Treehugger Robot [Fri, 14 Feb 2020 05:35:07 +0000 (05:35 +0000)]
Merge "gd: Authenticate only if necessary"

4 years agoMerge "gd: Add link layer collision hci error code" am: d71a785f4a
Treehugger Robot [Fri, 14 Feb 2020 05:25:18 +0000 (05:25 +0000)]
Merge "gd: Add link layer collision hci error code" am: d71a785f4a

Change-Id: I7c2672abcc823a4fa1d504292f89b48efb7f54e4

4 years agoMerge "gd: Add a remote name database" am: cf9f932946
Treehugger Robot [Fri, 14 Feb 2020 05:25:11 +0000 (05:25 +0000)]
Merge "gd: Add a remote name database" am: cf9f932946

Change-Id: Ifb1d86aed13d9acb1b600f037c6346fd18039a35

4 years agoMerge "gd: Add link layer collision hci error code"
Treehugger Robot [Fri, 14 Feb 2020 05:14:15 +0000 (05:14 +0000)]
Merge "gd: Add link layer collision hci error code"

4 years agoMerge "gd: Add a remote name database"
Treehugger Robot [Fri, 14 Feb 2020 05:06:06 +0000 (05:06 +0000)]
Merge "gd: Add a remote name database"

4 years agoMerge "gd: Ensure all events are handled for new classic pairing manager" am: 91040059cf
Treehugger Robot [Fri, 14 Feb 2020 04:03:07 +0000 (04:03 +0000)]
Merge "gd: Ensure all events are handled for new classic pairing manager" am: 91040059cf

Change-Id: I270c2e740bbf613881d2a568d3102bff7208f640

4 years agoMerge "gd: Expand and log more acl events" am: 495ac9fd42
Treehugger Robot [Fri, 14 Feb 2020 04:03:00 +0000 (04:03 +0000)]
Merge "gd: Expand and log more acl events" am: 495ac9fd42

Change-Id: I1efd4a34619580b4bf44d339d4b9375b86c1ffa4

4 years agoMerge "gd: Ensure all events are handled for new classic pairing manager"
Treehugger Robot [Fri, 14 Feb 2020 03:23:47 +0000 (03:23 +0000)]
Merge "gd: Ensure all events are handled for new classic pairing manager"

4 years agoMerge "gd: Expand and log more acl events"
Treehugger Robot [Fri, 14 Feb 2020 03:19:37 +0000 (03:19 +0000)]
Merge "gd: Expand and log more acl events"

4 years agoMerge "Set proper scan type before first discovery" am: 8a85f88766
Treehugger Robot [Fri, 14 Feb 2020 02:34:27 +0000 (02:34 +0000)]
Merge "Set proper scan type before first discovery" am: 8a85f88766

Change-Id: I033711d3dfacea25a514ec4eba748ffc513b8c4b

4 years agoMerge "Set proper scan type before first discovery"
Treehugger Robot [Fri, 14 Feb 2020 02:20:16 +0000 (02:20 +0000)]
Merge "Set proper scan type before first discovery"

4 years agogd: Add a remote name database
Chris Manton [Fri, 14 Feb 2020 00:18:30 +0000 (16:18 -0800)]
gd: Add a remote name database

Simple module to cache remote names.  Used by shim layer.

Bug: 149524116
Test: bluetooth_test_gd

Change-Id: I63e94e0ff1ea04c3ec35d502ac1de001a11f7b98

4 years agogd: Authenticate only if necessary
Chris Manton [Fri, 14 Feb 2020 00:20:14 +0000 (16:20 -0800)]
gd: Authenticate only if necessary

If a device are pairing but not bonding then
authenticate may get called twice, once when
the channel is set up and again when the
pairing manager is launched.

Bug: 149524116
Test: bluetooth_test_gd

Change-Id: Icddecd549030ade41e5679d46580881b56833d9e

4 years agogd: Expand and log more acl events
Chris Manton [Fri, 14 Feb 2020 00:19:47 +0000 (16:19 -0800)]
gd: Expand and log more acl events

Bug: 146086425
Test: blueooth_test_gd

Change-Id: I8dc506eea0bbcc3a9310d758311f369a31993bfd

4 years agoMerge "Update time stamp when new inq_db" am: 2a2a2ccdfe
Treehugger Robot [Fri, 14 Feb 2020 00:46:37 +0000 (00:46 +0000)]
Merge "Update time stamp when new inq_db" am: 2a2a2ccdfe

Change-Id: Iea78ed7246a5815492040f26470b638a6a92aab9

4 years agogd: Ensure all events are handled for new classic pairing manager
Chris Manton [Wed, 12 Feb 2020 20:10:08 +0000 (12:10 -0800)]
gd: Ensure all events are handled for new classic pairing manager

a new classic pairing manager never processes the initiating event.

Bug: 146086425
Test: bluetooth_test_gd

Change-Id: I3471bc5849315456d7429747e894cf80eda8b8cb

4 years agoMerge "Update time stamp when new inq_db"
Treehugger Robot [Fri, 14 Feb 2020 00:28:34 +0000 (00:28 +0000)]
Merge "Update time stamp when new inq_db"

4 years agoMerge "Remove some unused inquiry code and callback function" am: 0c680506dd
Treehugger Robot [Thu, 13 Feb 2020 23:38:08 +0000 (23:38 +0000)]
Merge "Remove some unused inquiry code and callback function" am: 0c680506dd

Change-Id: I731826725d00d797f12aea06c9089aece9349576

4 years agoMerge "Remove some unused inquiry code and callback function"
Treehugger Robot [Thu, 13 Feb 2020 23:20:48 +0000 (23:20 +0000)]
Merge "Remove some unused inquiry code and callback function"

4 years agoUse mobly.asserts
Hansong Zhang [Thu, 13 Feb 2020 23:12:45 +0000 (15:12 -0800)]
Use mobly.asserts

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

4 years agoGet rid of UI callbacks from SecurityManagerListener am: 780de25b57
Jakub Pawlowski [Thu, 13 Feb 2020 22:07:08 +0000 (22:07 +0000)]
Get rid of UI callbacks from SecurityManagerListener am: 780de25b57

Change-Id: I3c825fc22d8ff092267e57d90decffa517be1a57

4 years agoGet rid of UI callbacks from SecurityManagerListener
Jakub Pawlowski [Wed, 12 Feb 2020 23:10:12 +0000 (00:10 +0100)]
Get rid of UI callbacks from SecurityManagerListener

Test: updated unittests
Bug: 142341141
Change-Id: If6b086f74d92e757d02df4174af73edb36d6de3d

4 years agoMerge "HCI: Set default event mask" am: 28b85bf926
Treehugger Robot [Thu, 13 Feb 2020 21:02:23 +0000 (21:02 +0000)]
Merge "HCI: Set default event mask" am: 28b85bf926

Change-Id: Ia7a90c55859f1adf226cdd2296dad96940fb0ab1

4 years agoMerge "HCI: Set default event mask"
Treehugger Robot [Thu, 13 Feb 2020 20:52:23 +0000 (20:52 +0000)]
Merge "HCI: Set default event mask"

4 years agoMerge "Cert: Move DUT assignment to common code" am: a9c267c844
Automerger Merge Worker [Thu, 13 Feb 2020 18:34:23 +0000 (18:34 +0000)]
Merge "Cert: Move DUT assignment to common code" am: a9c267c844

Change-Id: I072331e36ee900fc8e0043ee3dac3f82e36de6b8

4 years agoMerge "Cert: Move DUT assignment to common code"
Treehugger Robot [Thu, 13 Feb 2020 18:20:01 +0000 (18:20 +0000)]
Merge "Cert: Move DUT assignment to common code"

4 years agoUpdate time stamp when new inq_db
Charles Lin [Thu, 13 Feb 2020 08:05:27 +0000 (16:05 +0800)]
Update time stamp when new inq_db

Test: Simulate a sitution with many LE devices around and start le scan
Bug: 146474336
Change-Id: I3a0f87786d0c7b13e4d85942ac0387fc334c26d4

4 years agoSet proper scan type before first discovery
Charles Lin [Thu, 13 Feb 2020 08:03:44 +0000 (16:03 +0800)]
Set proper scan type before first discovery

Set scan type when start first discover after bt enabled.
And replace adv evt hex code to define code

Test: Enable Bluetooth and then start discovery.
Bug: 146474336
Change-Id: I63c8cda5343de15381c83da4ea3afde6b75aaf6a

4 years agoRemove some unused inquiry code and callback function
Charles Lin [Thu, 13 Feb 2020 08:00:11 +0000 (16:00 +0800)]
Remove some unused inquiry code and callback function

Test: manually
Bug: 146474336
Change-Id: I6d3a0d9066ef6a4fbc14f938db6f120147340804

4 years agoMerge "Don't guess transport during pairing" am: da18b203cf
Automerger Merge Worker [Thu, 13 Feb 2020 07:02:14 +0000 (07:02 +0000)]
Merge "Don't guess transport during pairing" am: da18b203cf

Change-Id: Ide731a64de1e95717a3b8fb3809e644a683e4142

4 years agoMerge "Don't guess transport during pairing"
Treehugger Robot [Thu, 13 Feb 2020 06:49:21 +0000 (06:49 +0000)]
Merge "Don't guess transport during pairing"

4 years agoSecurity UI interface cleanup am: 4ce48335f8
Automerger Merge Worker [Thu, 13 Feb 2020 06:24:22 +0000 (06:24 +0000)]
Security UI interface cleanup am: 4ce48335f8

Change-Id: I31cfb067bcc788dd2075483ccd4fae5816957867

4 years agoSecurity UI interface cleanup
Jakub Pawlowski [Wed, 12 Feb 2020 21:02:40 +0000 (22:02 +0100)]
Security UI interface cleanup

We currently have two separate UI interfaces for LE and Classic, this
patch merges them into single one.

Bug: 142341141
Test: tests updated
Change-Id: I5fa347a1d4d50d85bb051782ca27f38f3d146239

4 years agoMerge "Pass UI Into Security Manager" am: a22cc619cf
Automerger Merge Worker [Thu, 13 Feb 2020 02:35:37 +0000 (02:35 +0000)]
Merge "Pass UI Into Security Manager" am: a22cc619cf

Change-Id: Ibbdfc480ea0f00c3c165fdc59ae3160bb65afd1b

4 years agoMerge "Pass UI Into Security Manager"
Treehugger Robot [Thu, 13 Feb 2020 02:21:07 +0000 (02:21 +0000)]
Merge "Pass UI Into Security Manager"

4 years agoGRPC: Use server_stream_call.cancelled() instead of hidden API
Jack He [Wed, 12 Feb 2020 20:43:13 +0000 (12:43 -0800)]
GRPC: Use server_stream_call.cancelled() instead of hidden API

* Use server_stream_call.cancelled() to check if a stream
  is cancelled to avoid calling hidden APIs

Test: run cert tests multiple times
Bug: 148147248
Change-Id: Iea352d4b428b9b57b911576a44f7a91842613fc7

4 years agoRootCanal HAL: Fixed race condition when tearing down rootcanal HAL
Jack He [Wed, 12 Feb 2020 20:39:33 +0000 (12:39 -0800)]
RootCanal HAL: Fixed race condition when tearing down rootcanal HAL

* One race condition exist when incoming_packet_callback_ is being
  reset while an incoming packet is being processed. This is fixed
  by adding a dedicated mutex incoming_packet_callback_mutex_
* Another race condition happen when HciHalHostRootcanal::Stop()
  tries to close the rootcanal FD while incomding_packet_callback
  is trying to read from it

Test: run cert tests multiple times
Bug: 148147248
Change-Id: Ic07374651c5ec38e90e7ddc545ca4fcd4a84cd04

4 years agoCert: Move DUT assignment to common code
Hansong Zhang [Thu, 13 Feb 2020 00:22:14 +0000 (16:22 -0800)]
Cert: Move DUT assignment to common code

Test: run_cert_facade_only.sh
Change-Id: I5ca6fd006294f00e06a4d6b52832a1d64aae8c9f

4 years agoDon't guess transport during pairing
Hansong Zhang [Wed, 12 Feb 2020 22:10:38 +0000 (14:10 -0800)]
Don't guess transport during pairing

Test: pair to AirPods
Bug: 149278864
Change-Id: I689ba0a0966b3f7a2cc2ac9a29ddf694017bfb0b

4 years agoHCI: Set default event mask
Myles Watson [Wed, 12 Feb 2020 16:53:39 +0000 (08:53 -0800)]
HCI: Set default event mask

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

4 years agoMerge "Initialize device_type before use it" am: f0b8df0614
Automerger Merge Worker [Wed, 12 Feb 2020 21:54:10 +0000 (21:54 +0000)]
Merge "Initialize device_type before use it" am: f0b8df0614

Change-Id: I7b3893bde9f201aef06298cb145f8a7824a80de8

4 years agoMerge "Initialize device_type before use it"
Treehugger Robot [Wed, 12 Feb 2020 21:44:44 +0000 (21:44 +0000)]
Merge "Initialize device_type before use it"

4 years agogd: Add link layer collision hci error code
Chris Manton [Wed, 12 Feb 2020 18:54:32 +0000 (10:54 -0800)]
gd: Add link layer collision hci error code

Seen with pairing with two authentication requests

Bug: 145638034
Test: bluetooth_test_gd

Change-Id: I8af068f9a11a67fae00d4b108082a3208a44d95a

4 years agoPass UI Into Security Manager
Jakub Pawlowski [Wed, 12 Feb 2020 18:19:11 +0000 (19:19 +0100)]
Pass UI Into Security Manager

Currently we have a static UI handler inside SecurityManagerImpl. Have
it passed from upper layers instead, to match what we will need in the
future.

Bug: 142341141
Change-Id: Iabc865a325b53c6455017347ade58ea23dd02a00

4 years agogd: Provide more info for unimplemented link responses am: a32e71095a
Automerger Merge Worker [Wed, 12 Feb 2020 18:15:36 +0000 (18:15 +0000)]
gd: Provide more info for unimplemented link responses am: a32e71095a

Change-Id: Id8be8e3aedd3afca3490bdcce6fb6831d3102245

4 years agogd: Provide more info for unimplemented link responses
Chris Manton [Wed, 12 Feb 2020 16:45:24 +0000 (08:45 -0800)]
gd: Provide more info for unimplemented link responses

Provide the unimplemented event info as they occur

Bug: 146086425
Test: bluetooth_test_gd
Change-Id: I7b06be303cdb36748304775b9b8554d0c605288b

4 years agoInitialize device_type before use it
Ugo Yu [Wed, 12 Feb 2020 09:04:34 +0000 (17:04 +0800)]
Initialize device_type before use it

We are using the default value of device_type when the transport type
is unkown, initialize it in case we get something weird.

Bug: 149353835
Test: Manual
Change-Id: I56d13fcebdf330356d1214cb095fcd4d5e658ff9

4 years agoMerge "Cert: Use site-packages instead of root" am: 48ed568ad8
Automerger Merge Worker [Wed, 12 Feb 2020 01:38:41 +0000 (01:38 +0000)]
Merge "Cert: Use site-packages instead of root" am: 48ed568ad8

Change-Id: Ib781208494cdb608d8b093798698af04aabb06ae

4 years agoLE Pairing Handler wiring am: 6b15a20af4
Automerger Merge Worker [Wed, 12 Feb 2020 01:38:27 +0000 (01:38 +0000)]
LE Pairing Handler wiring am: 6b15a20af4

Change-Id: Iaa7096109db6b2ffa425fbe3aa1cf8b7dbb27d97