OSDN Git Service

android-x86/system-bt.git
4 years agoGet rid of Security shim am: c3a2419e8c am: e7ad00a69a
Automerger Merge Worker [Wed, 19 Feb 2020 01:19:36 +0000 (01:19 +0000)]
Get rid of Security shim am: c3a2419e8c am: e7ad00a69a

Change-Id: I48d4734ee58a4362913ce8edf8772c99757bcc10

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 agosmp_generate_stk: reduce log level for key type information am: f00a504ccf am: de4afdcccf
Automerger Merge Worker [Tue, 18 Feb 2020 23:03:44 +0000 (23:03 +0000)]
smp_generate_stk: reduce log level for key type information am: f00a504ccf am: de4afdcccf

Change-Id: I8cbaef9dd934735e312d0532200e198d815b16bd

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 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 am: a831144350
Automerger Merge Worker [Tue, 18 Feb 2020 22:29:49 +0000 (22:29 +0000)]
Merge "gd: Unregister events at the hci layer" am: a9b293a12e am: a831144350

Change-Id: Ic1892799b482f745316e0696b4cf8e35342489a1

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

Change-Id: I889912c69b2f277203e8b3d4b13db68de34638f4

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 am: e9ee432da8
Automerger Merge Worker [Tue, 18 Feb 2020 22:05:53 +0000 (22:05 +0000)]
Get rid of Discoverability shim am: a71658fa0f am: e9ee432da8

Change-Id: Ibf2a0d258d1bc2af94b3e8c8b6519c3e7446dbbf

4 years agoGet rid of the redundant shim interfaces am: c73a895fa2 am: b34f0e0c9f
Automerger Merge Worker [Tue, 18 Feb 2020 22:05:29 +0000 (22:05 +0000)]
Get rid of the redundant shim interfaces am: c73a895fa2 am: b34f0e0c9f

Change-Id: I788e8262637a0fbc3d6e5ff73952800bfa3e61a1

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 am: a478dcd645
Automerger Merge Worker [Tue, 18 Feb 2020 21:24:02 +0000 (21:24 +0000)]
Canonicalize header include files am: 6a03ea25f6 am: a478dcd645

Change-Id: Ia343ced7c7d3313e2fed29a3d513966198ef2912

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 am: 2fdd290a19
Jakub Pawlowski [Tue, 18 Feb 2020 17:41:27 +0000 (17:41 +0000)]
Do not redefine logging if already defined am: 183a1b0864 am: 2fdd290a19

Change-Id: Iefadb5743b2144aaf0548cdd79a55b53faf933ab

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

Change-Id: I7f8230e372b496147b67ff25f41b065d913e3e6b

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 06:03:32 +0000 (06:03 +0000)]
Modify service_type constants to not collide with constants in GD am: 17799fd1ec am: 20727d650b

Change-Id: Ia845ce4bb336bab335d73b1a557e670a36adad03

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 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 am: 827e7f8d49
Treehugger Robot [Sat, 15 Feb 2020 02:51:34 +0000 (02:51 +0000)]
Merge "PDL: Serialize nested packets in Python" am: ea2f6e05e0 am: 827e7f8d49

Change-Id: I1e80263cb24637376131cd5c07b2d272f2c2799c

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 am: b21d8c14cd
Treehugger Robot [Fri, 14 Feb 2020 22:06:11 +0000 (22:06 +0000)]
Merge changes Iea352d4b,Ic0737465 am: 91a57b0601 am: b21d8c14cd

Change-Id: I0f828b150545a4f93746938eedb2a544479b5de9

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 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 am: 8adba52296
Treehugger Robot [Fri, 14 Feb 2020 06:49:47 +0000 (06:49 +0000)]
Merge "Use mobly.asserts" am: 4cc2f58735 am: 8adba52296

Change-Id: Idb215d4624f9af1df27577a49f7f8ae80926b705

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 am: 4c4cabe024
Treehugger Robot [Fri, 14 Feb 2020 06:01:13 +0000 (06:01 +0000)]
Merge "gd: Authenticate only if necessary" am: fac9feea44 am: 4c4cabe024

Change-Id: Ib7efc8975fc72ce05e016fa1a99cac16866b5aaa

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: Add link layer collision hci error code" am: d71a785f4a am: b933f804a7
Treehugger Robot [Fri, 14 Feb 2020 05:40:38 +0000 (05:40 +0000)]
Merge "gd: Add link layer collision hci error code" am: d71a785f4a am: b933f804a7

Change-Id: I8e4f3b88b45d5ad8ff4393b3fb5083b357f62572

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

Change-Id: I48d2b5e107d7b71af6e8c496af9dc7389ef600ab

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: 9104005...
Treehugger Robot [Fri, 14 Feb 2020 04:18:24 +0000 (04:18 +0000)]
Merge "gd: Ensure all events are handled for new classic pairing manager" am: 91040059cf am: f913259ade

Change-Id: I41d5799796dc58b5091711f8c24558f30da8ae17

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

Change-Id: I671263d801ea353ba5cb7a87634d968cebdd1e70

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 am: 52178719b7
Treehugger Robot [Fri, 14 Feb 2020 02:54:08 +0000 (02:54 +0000)]
Merge "Set proper scan type before first discovery" am: 8a85f88766 am: 52178719b7

Change-Id: I58ddec861bd2f5f967697c8cef85cfbb0d193c6a

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 am: ca21254131
Treehugger Robot [Fri, 14 Feb 2020 00:57:45 +0000 (00:57 +0000)]
Merge "Update time stamp when new inq_db" am: 2a2a2ccdfe am: ca21254131

Change-Id: I64a5af92d5a442fb2c6364c328b6fc7d2f5d3528

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 am:...
Treehugger Robot [Thu, 13 Feb 2020 23:49:24 +0000 (23:49 +0000)]
Merge "Remove some unused inquiry code and callback function" am: 0c680506dd am: b4829f55ec

Change-Id: I5f08f25cf54f32f2986b3992b2dafe85961f0959

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 am: 5aad124e52
Jakub Pawlowski [Thu, 13 Feb 2020 22:16:54 +0000 (22:16 +0000)]
Get rid of UI callbacks from SecurityManagerListener am: 780de25b57 am: 5aad124e52

Change-Id: I06df59923c6a812c5486ce9d4afd213fc0ab56bb

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 am: fb95faf0b6
Treehugger Robot [Thu, 13 Feb 2020 21:16:30 +0000 (21:16 +0000)]
Merge "HCI: Set default event mask" am: 28b85bf926 am: fb95faf0b6

Change-Id: Idf70db1084ea5d810298611d10d198078f9bae7c

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 am: a3139d938e
Automerger Merge Worker [Thu, 13 Feb 2020 18:44:00 +0000 (18:44 +0000)]
Merge "Cert: Move DUT assignment to common code" am: a9c267c844 am: a3139d938e

Change-Id: I337438786880b32e08cd9bc57fa3100bc74784a8

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 am: fc80120bae
Automerger Merge Worker [Thu, 13 Feb 2020 07:22:26 +0000 (07:22 +0000)]
Merge "Don't guess transport during pairing" am: da18b203cf am: fc80120bae

Change-Id: Icdd0cb4aae30fb6e2bcc7e9d8e3f6eaa4da6cc11

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 am: 164dc960d5
Automerger Merge Worker [Thu, 13 Feb 2020 06:42:12 +0000 (06:42 +0000)]
Security UI interface cleanup am: 4ce48335f8 am: 164dc960d5

Change-Id: I34df74d6828bb0a5327c64977996de1f31d6a696

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 am: 6490f37181
Automerger Merge Worker [Thu, 13 Feb 2020 02:49:02 +0000 (02:49 +0000)]
Merge "Pass UI Into Security Manager" am: a22cc619cf am: 6490f37181

Change-Id: Ie685ff3af730449be71792ec54bca86eebcbbc54

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 am: ed12fb644d
Automerger Merge Worker [Wed, 12 Feb 2020 22:22:25 +0000 (22:22 +0000)]
Merge "Initialize device_type before use it" am: f0b8df0614 am: ed12fb644d

Change-Id: Iefdadee8691559440c653aa42de77f22f57f22a0

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