OSDN Git Service

android-x86/system-bt.git
6 years agoHFP: Use objects for shared library interface and callbacks (1/2) am: 12a576dc5f
Jack He [Thu, 4 Jan 2018 19:33:16 +0000 (19:33 +0000)]
HFP: Use objects for shared library interface and callbacks (1/2) am: 12a576dc5f
am: 9ab7749251

Change-Id: I2474b07ba76d03e046b2344ad5ac5e87694b5a11

6 years agoHFP: Use objects for shared library interface and callbacks (1/2)
Jack He [Thu, 4 Jan 2018 19:29:45 +0000 (19:29 +0000)]
HFP: Use objects for shared library interface and callbacks (1/2)
am: 12a576dc5f

Change-Id: I065fcf449afce66b2f10ab75d3aba7a349d4c350

6 years agoHFP: Use objects for shared library interface and callbacks (1/2)
Jack He [Thu, 14 Dec 2017 23:00:39 +0000 (15:00 -0800)]
HFP: Use objects for shared library interface and callbacks (1/2)

* Declare bluetooth::headset::Interface and
  bluetooth::headset::Callbacks instead of using structs
* Put HFP related methods and types into bluetooth::headset namespace
* Rename those methods into CamelStyle according to Google C++ style
  guide
* Remove the usage of HAL_CBACK in HFP as we only need to check if the
  callback object is null and all its methods must be implemented as
  mandated by rules of the pure virtual function
* These classes can be mocked during test to isolate behaviors
* Improved effort handling in btif_hf.cc to log error messages during
  failures

Bug: 70538124
Test: unit tests, testplans/135585
Change-Id: Iba120ef9d0a9701aececd300395b7b18d2d44e7d

6 years agoAdded RawAddress::FromOctets method to copy address from uint8_t pointer am: c57d93a35f
Pavlin Radoslavov [Thu, 4 Jan 2018 02:56:26 +0000 (02:56 +0000)]
Added RawAddress::FromOctets method to copy address from uint8_t pointer am: c57d93a35f
am: bf454b7e75

Change-Id: I1b4eed0118c71b7fad05d14d5e8859b8942a135c

6 years agoAdded RawAddress::FromOctets method to copy address from uint8_t pointer
Pavlin Radoslavov [Thu, 4 Jan 2018 02:53:18 +0000 (02:53 +0000)]
Added RawAddress::FromOctets method to copy address from uint8_t pointer
am: c57d93a35f

Change-Id: Id48a1ed16b0150f8c42e2737531c75e8fa1733b5

6 years agoAdded RawAddress::FromOctets method to copy address from uint8_t pointer
Pavlin Radoslavov [Sun, 26 Nov 2017 04:51:36 +0000 (20:51 -0800)]
Added RawAddress::FromOctets method to copy address from uint8_t pointer

Also, added missing unit test for existing constructor

Test: Unit test added
Change-Id: Id642aaf2651c59b87af344c78aafc87aba2898d1

6 years agoAdvertising Filtering: send all filters in one batch (2/2) am: 0ddfae721a
Jakub Pawlowski [Wed, 3 Jan 2018 22:39:27 +0000 (22:39 +0000)]
Advertising Filtering: send all filters in one batch (2/2) am: 0ddfae721a
am: 77a04d4b62

Change-Id: I581859e8e234e24a034906e2fc47b241c6bae0a8

6 years agoAdvertising Filtering: send all filters in one batch (2/2)
Jakub Pawlowski [Wed, 3 Jan 2018 22:35:52 +0000 (22:35 +0000)]
Advertising Filtering: send all filters in one batch (2/2)
am: 0ddfae721a

Change-Id: I36dca21c52968fc4ddb2ef3b1cfd4b7d6106391b

6 years agoAdvertising Filtering: send all filters in one batch (2/2)
Jakub Pawlowski [Tue, 3 Oct 2017 19:31:48 +0000 (12:31 -0700)]
Advertising Filtering: send all filters in one batch (2/2)

Bug: 67371480
Test: sl4a FilteringTest
Change-Id: I93595b5ed4e7cf25cdb6a8b1f9413a7f05e61774

6 years agoMerge "Temporarily remove broken SCO-over-HCI implementation" am: 3d4e3b5861
Hansong Zhang [Wed, 3 Jan 2018 18:42:54 +0000 (18:42 +0000)]
Merge "Temporarily remove broken SCO-over-HCI implementation" am: 3d4e3b5861
am: 7685e2fbc9

Change-Id: I6b566d2a07595f4f6371cb0c00424ebe887a7963

6 years agoMerge "Temporarily remove broken SCO-over-HCI implementation"
Hansong Zhang [Wed, 3 Jan 2018 18:39:19 +0000 (18:39 +0000)]
Merge "Temporarily remove broken SCO-over-HCI implementation"
am: 3d4e3b5861

Change-Id: Id420d440f7692eb37547c01437b387d3b1935113

6 years agoMerge "Temporarily remove broken SCO-over-HCI implementation"
Treehugger Robot [Wed, 3 Jan 2018 18:35:35 +0000 (18:35 +0000)]
Merge "Temporarily remove broken SCO-over-HCI implementation"

6 years agoRemove bytes after first zero length field in legacy advertisements am: 5a290f877f
Jakub Pawlowski [Wed, 3 Jan 2018 12:41:33 +0000 (12:41 +0000)]
Remove bytes after first zero length field in legacy advertisements am: 5a290f877f
am: 750da04807

Change-Id: Ib4d2af62bfd3546624ef125ae8ef1e0d24e5b10c

6 years agoRemove bytes after first zero length field in legacy advertisements
Jakub Pawlowski [Wed, 3 Jan 2018 12:38:01 +0000 (12:38 +0000)]
Remove bytes after first zero length field in legacy advertisements
am: 5a290f877f

Change-Id: Ie75a131a635e9e9e471ad3e4fdc8781d1127b5a2

6 years agoRemove bytes after first zero length field in legacy advertisements
Jakub Pawlowski [Wed, 3 Jan 2018 09:49:41 +0000 (01:49 -0800)]
Remove bytes after first zero length field in legacy advertisements

This is for compatibility with many existing old devices, that have
non-zero bytes after zero length field. This is currently causing
advertisements to be dropped, rendering those devices invisible.

Bug: 68907583
Test: AdvertiseDataParserTest.RemoveTrailingZerosMalformed
Change-Id: Ib51950f7e0c6a2771f56c6f69108fa10f2517f38

6 years agoMinor style fixes in l2c_main.cc am: 4883a8cbb2
Jakub Pawlowski [Wed, 3 Jan 2018 08:49:34 +0000 (08:49 +0000)]
Minor style fixes in l2c_main.cc am: 4883a8cbb2
am: 3c3dce49c7

Change-Id: I5bc41ae88ff588a81be1f0148cd6ca770aff9419

6 years agoMinor style fixes in l2c_main.cc
Jakub Pawlowski [Wed, 3 Jan 2018 08:45:30 +0000 (08:45 +0000)]
Minor style fixes in l2c_main.cc
am: 4883a8cbb2

Change-Id: Id9415750cb309163f81320f3638e962aa8db9420

6 years agoTemporarily remove broken SCO-over-HCI implementation
Hansong Zhang [Tue, 2 Jan 2018 21:48:42 +0000 (13:48 -0800)]
Temporarily remove broken SCO-over-HCI implementation

This is currently not used on known Android platforms and currently does
not compile. To be re-visited when SCO-over-HCI can be re-implemented
based on the new HAL.

Test: make
Bug: 70965527
Change-Id: Iefff5b3fb1599a0cdb2c7fb90b463f3643a2a47e

6 years agoMinor style fixes in l2c_main.cc
Jakub Pawlowski [Thu, 7 Dec 2017 09:21:48 +0000 (01:21 -0800)]
Minor style fixes in l2c_main.cc

Bug: 69623109
Test: compilation
Change-Id: Ie5d744bced1e392d9cfa57ae6c9b4a4664c021c8

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)" am: 983c79f643
Hansong Zhang [Thu, 21 Dec 2017 22:32:18 +0000 (22:32 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)" am: 983c79f643
am: 7066f03690

Change-Id: I3a29531116620d3ab1bd2dab3470951e4110f644

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)"
Hansong Zhang [Thu, 21 Dec 2017 22:08:42 +0000 (22:08 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)"
am: 983c79f643

Change-Id: Ia5adefe6cff4338b2ebf6b4a043ca77fdd9e5231

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)"
Treehugger Robot [Thu, 21 Dec 2017 21:56:11 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)"

6 years agoIncrease MPS for LE CoC to one LE Buffer Size am: f18b31e1e3
Jakub Pawlowski [Thu, 21 Dec 2017 20:59:01 +0000 (20:59 +0000)]
Increase MPS for LE CoC to one LE Buffer Size am: f18b31e1e3
am: b7b046755a

Change-Id: I3e72dfd516fc9994a0d413bfecfbc5b80b41623b

6 years agoIncrease MPS for LE CoC to one LE Buffer Size
Jakub Pawlowski [Thu, 21 Dec 2017 20:54:27 +0000 (20:54 +0000)]
Increase MPS for LE CoC to one LE Buffer Size
am: f18b31e1e3

Change-Id: I8837cbb289d9138ec21088b9aecc84b4864ab7d8

6 years agoMerge "Increase default SDP_MTU_SIZE to 1024" am: 94559ee329
Kim Low [Thu, 21 Dec 2017 20:13:00 +0000 (20:13 +0000)]
Merge "Increase default SDP_MTU_SIZE to 1024" am: 94559ee329
am: 5a6f0b700f

Change-Id: I5b2d1618bfbb8ddb55a4cb0f7ba8449245d9f31d

6 years agoMerge "Increase default SDP_MTU_SIZE to 1024"
Kim Low [Thu, 21 Dec 2017 19:37:39 +0000 (19:37 +0000)]
Merge "Increase default SDP_MTU_SIZE to 1024"
am: 94559ee329

Change-Id: I1c922824d6b6c8a82f69a5584fb023c304d4477e

6 years agoIncrease MPS for LE CoC to one LE Buffer Size
Jakub Pawlowski [Tue, 19 Dec 2017 21:22:27 +0000 (13:22 -0800)]
Increase MPS for LE CoC to one LE Buffer Size

This should improve throughtput, and reduce number of LE-U PDUs needed
to send message over LE channel.

Test: compilation
Change-Id: Ic1e203eaec0b8012984f27d3c488ea6eb0945399

6 years agoMerge "Increase default SDP_MTU_SIZE to 1024"
Treehugger Robot [Thu, 21 Dec 2017 15:11:56 +0000 (15:11 +0000)]
Merge "Increase default SDP_MTU_SIZE to 1024"

6 years agoBluetoothHidDevice: rename onIntrData to onInterruptData (2/5)
Hansong Zhang [Mon, 18 Dec 2017 23:22:22 +0000 (15:22 -0800)]
BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)

Bug: 63384609
Test: make
Merged-In: I76a149f1c7f30ac3eec31d57053231f7f6dac01d
Change-Id: I76a149f1c7f30ac3eec31d57053231f7f6dac01d
(cherry picked from commit 0fa9df6938dfe7dafa10601ea904cd6f1d2e95c2)

6 years agoMinor GATT logging fixes am: fdae46505f
Jakub Pawlowski [Wed, 20 Dec 2017 12:22:21 +0000 (12:22 +0000)]
Minor GATT logging fixes am: fdae46505f
am: bc9adf4f24

Change-Id: Id5528e6c34ccc38e2cc4fba147612a92ad7a1325

6 years agoMinor GATT logging fixes
Jakub Pawlowski [Wed, 20 Dec 2017 12:19:50 +0000 (12:19 +0000)]
Minor GATT logging fixes
am: fdae46505f

Change-Id: Ic2d7530c2650139a0c648e90aa716b691feb9768

6 years agoIncrease default SDP_MTU_SIZE to 1024
Kim Low [Mon, 11 Dec 2017 22:38:01 +0000 (14:38 -0800)]
Increase default SDP_MTU_SIZE to 1024

This fixes a problem where older DualShock4 controllers would
not connect with SDP_MTU_SIZE < 1024.

Fixes: 70356237
Change-Id: I96a6ee0536547b93f2ae411eb1d8860292855c31

6 years agoMinor GATT logging fixes
Jakub Pawlowski [Wed, 13 Dec 2017 18:12:39 +0000 (10:12 -0800)]
Minor GATT logging fixes

Test: compilation
Bug: 70297056
Change-Id: If71bbb19a08abbbb30b5ce5027aed97e03b3baaa

6 years agoHFP: Add interface to disable in-band ringing through BSIR (1/2) am: b55bc83c9e
Jack He [Mon, 18 Dec 2017 23:22:20 +0000 (23:22 +0000)]
HFP: Add interface to disable in-band ringing through BSIR (1/2) am: b55bc83c9e
am: c55d0cf34d

Change-Id: I85201ffb6f18cdeb1dcafe4b83078fe590e496da

6 years agoHFP: Add interface to disable in-band ringing through BSIR (1/2)
Jack He [Mon, 18 Dec 2017 23:18:02 +0000 (23:18 +0000)]
HFP: Add interface to disable in-band ringing through BSIR (1/2)
am: b55bc83c9e

Change-Id: I352b392a83f14bdd07a318b451a5426601cebf3d

6 years agoHFP: Add interface to disable in-band ringing through BSIR (1/2)
Jack He [Mon, 4 Dec 2017 22:13:01 +0000 (14:13 -0800)]
HFP: Add interface to disable in-band ringing through BSIR (1/2)

* Add send_bsir(bool, RawAddress*) to turn
  in-band ringtone feature ON and OFF dynamically during a service
  level connection with a headset

Bug: 70173881
Test: make
Change-Id: I358e39a9176d75dfb8682e77cf567f87eb417d1a

6 years agobt: Update libchrome APIS to r456626. am: aeca7aa7a7
Hidehiko Abe [Mon, 18 Dec 2017 10:37:49 +0000 (10:37 +0000)]
bt: Update libchrome APIS to r456626. am: aeca7aa7a7
am: a6eb6e86bd

Change-Id: I09c4739d3ee7635d0cbdedc398393dc2de735282

6 years agobt: Update libchrome APIS to r456626.
Hidehiko Abe [Mon, 18 Dec 2017 10:34:35 +0000 (10:34 +0000)]
bt: Update libchrome APIS to r456626.
am: aeca7aa7a7

Change-Id: I9b90c9be75ae4e7d1ed3f3602298eb29d6407e35

6 years agobt: Update libchrome APIS to r456626.
Hidehiko Abe [Wed, 13 Dec 2017 09:57:10 +0000 (18:57 +0900)]
bt: Update libchrome APIS to r456626.

The new libchrome has been ported from Chromium and some APIs
have changed. Make necessary changes at call sites.

Test: Build.
Change-Id: I4c904a9e8b76f1ee72e14d62740cb0d88963b270
Merged-In: I0cc2cf8521caf5f6f69346bb3ce3dc1c59b95cc6

6 years agoMerge "Add extra log message to print output codec config" am: 12389b46c9
Pavlin Radoslavov [Sat, 16 Dec 2017 00:24:10 +0000 (00:24 +0000)]
Merge "Add extra log message to print output codec config" am: 12389b46c9
am: 0fd99f4ea8

Change-Id: I65e32750787564202ae4f1105cc94a4773c4ab6f

6 years agoMerge "Add extra log message to print output codec config"
Pavlin Radoslavov [Sat, 16 Dec 2017 00:20:15 +0000 (00:20 +0000)]
Merge "Add extra log message to print output codec config"
am: 12389b46c9

Change-Id: I11ba8ff9116754794153bd2d70436b7332259f54

6 years agoMerge "Add extra log message to print output codec config"
Treehugger Robot [Sat, 16 Dec 2017 00:09:34 +0000 (00:09 +0000)]
Merge "Add extra log message to print output codec config"

6 years agoMerge "HFP: Use do_in_jni_thread to avoid btif_transfer_context" am: 193c654fef
Jack He [Fri, 15 Dec 2017 19:20:54 +0000 (19:20 +0000)]
Merge "HFP: Use do_in_jni_thread to avoid btif_transfer_context" am: 193c654fef
am: d6f7cbc080

Change-Id: I6e1a9ac032fd2df387c2a61153a23f4d848da4dd

6 years agoMerge "HFP: Use do_in_jni_thread to avoid btif_transfer_context"
Jack He [Fri, 15 Dec 2017 19:17:50 +0000 (19:17 +0000)]
Merge "HFP: Use do_in_jni_thread to avoid btif_transfer_context"
am: 193c654fef

Change-Id: I765ef7fcb7dd358563f77a1f76058657297c54b6

6 years agoMerge "HFP: Use do_in_jni_thread to avoid btif_transfer_context"
Treehugger Robot [Fri, 15 Dec 2017 19:09:36 +0000 (19:09 +0000)]
Merge "HFP: Use do_in_jni_thread to avoid btif_transfer_context"

6 years agoHCI: Fix use after free in hci_transmit am: 199dee1f8c
Myles Watson [Fri, 15 Dec 2017 02:19:20 +0000 (02:19 +0000)]
HCI: Fix use after free in hci_transmit am: 199dee1f8c
am: 396c0004b7

Change-Id: I7d232248ed52210cb49407bab2cdb302f10cdaa2

6 years agoHCI: Fix use after free in hci_transmit
Myles Watson [Fri, 15 Dec 2017 02:07:20 +0000 (02:07 +0000)]
HCI: Fix use after free in hci_transmit
am: 199dee1f8c

Change-Id: I8e325585fb2b90246ed90db7797adab48d70530a

6 years agoAdd extra log message to print output codec config
Pavlin Radoslavov [Fri, 15 Dec 2017 00:35:28 +0000 (16:35 -0800)]
Add extra log message to print output codec config

Test: Code compilation and log observation
Change-Id: Iee41fe0566b1d635431a9535099a3601c8de11b6

6 years agoHCI: Fix use after free in hci_transmit
Myles Watson [Thu, 14 Dec 2017 20:20:40 +0000 (12:20 -0800)]
HCI: Fix use after free in hci_transmit

Bug: 70626623
Test: Sanity Bluetooth on/off
Change-Id: Ie8c857f8bdf3897fd3776772a4198bab823c6115

6 years agoHFP: Use do_in_jni_thread to avoid btif_transfer_context
Jack He [Tue, 12 Dec 2017 04:21:36 +0000 (20:21 -0800)]
HFP: Use do_in_jni_thread to avoid btif_transfer_context

* Use do_in_jni_thread and base::Bind() to pass callbacks to JNI thread
* Remove unnecessary code after the refactoring

Bug: 70538124
Test: make, conntect to HFP-enabled car kits
Change-Id: Iea8f19732d40bf40b056fea760ee5cf785a5812b

6 years agoMerge "btif_sock_rfc: Use %u for uint32_t" am: c30ff64348
Yi Kong [Thu, 14 Dec 2017 21:42:38 +0000 (21:42 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t" am: c30ff64348
am: 7efbdaf0dd

Change-Id: I2468a22c1ca37fde3b2d40f2df78fe48b1b3db03

6 years agoMerge "btif_sock_rfc: Use %u for uint32_t"
Yi Kong [Thu, 14 Dec 2017 21:40:06 +0000 (21:40 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t"
am: c30ff64348

Change-Id: I93406b27af75662f0d5f58b9438eeffa1c547f07

6 years agoMerge "btif_sock_rfc: Use %u for uint32_t"
Treehugger Robot [Thu, 14 Dec 2017 21:27:12 +0000 (21:27 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t"

6 years agoMerge "Fix Bluetooth crash on user switching" am: 7dba951c61
Jakub Pawlowski [Thu, 14 Dec 2017 20:04:02 +0000 (20:04 +0000)]
Merge "Fix Bluetooth crash on user switching" am: 7dba951c61
am: 0fdf1d9e45

Change-Id: Ie2cd358e7dc7762953e5562d0542876f0cb9215e

6 years agoFix GATT discovery service fail over BR/EDR am: b00872797a
Chao Quan [Thu, 14 Dec 2017 20:03:18 +0000 (20:03 +0000)]
Fix GATT discovery service fail over BR/EDR am: b00872797a
am: a2e11ccd58

Change-Id: Icfdc12c1b57e13852027be563a152990b3b4d599

6 years agoMerge "Fix Bluetooth crash on user switching"
Jakub Pawlowski [Thu, 14 Dec 2017 19:55:03 +0000 (19:55 +0000)]
Merge "Fix Bluetooth crash on user switching"
am: 7dba951c61

Change-Id: Iee0f6698d762c0a88d5140c3fd9a9893c7370aaf

6 years agoFix GATT discovery service fail over BR/EDR
Chao Quan [Thu, 14 Dec 2017 19:54:35 +0000 (19:54 +0000)]
Fix GATT discovery service fail over BR/EDR
am: b00872797a

Change-Id: Ib2b8a7cfe8757942a1eb25dd14c298a15809d5c5

6 years agoMerge "Fix Bluetooth crash on user switching"
Treehugger Robot [Thu, 14 Dec 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Fix Bluetooth crash on user switching"

6 years agoFix GATT discovery service fail over BR/EDR
Chao Quan [Mon, 23 Oct 2017 11:41:13 +0000 (19:41 +0800)]
Fix GATT discovery service fail over BR/EDR

According to the current gattc state machine, stack queues
discovery services request comes from framework when gattc
is in BTA_GATTC_DISCOVER_ST state. This request is re-scheduled
after discovery on server finished in bta_gattc_disc_cmpl
and return the discovery results to framemwork. But now, stack
assumed LE transport in code, which prevents discovery services
executing. This error can be detected by ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered

Fix assumed transport to actual situantion

Test: ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered
Change-Id: I110a0a3c19595fb76c3bb15b092ce18ebf7b11bf

6 years agoFix Bluetooth crash on user switching
Jakub Pawlowski [Thu, 14 Dec 2017 17:26:43 +0000 (09:26 -0800)]
Fix Bluetooth crash on user switching

Test: compilation
Fixes: 70634701
Change-Id: I571bb8dde1317b2a7e4a73a1316c4c26d0f19466

6 years agobtif_sock_rfc: Use %u for uint32_t
Yi Kong [Wed, 6 Dec 2017 00:25:56 +0000 (16:25 -0800)]
btif_sock_rfc: Use %u for uint32_t

Discovered by the upcoming compiler update.

Test: build
Change-Id: If1497232b8f74bfc95194126a398e62f6eda7672

6 years agoHFP: Fix static check errors am: 6545d3f346
Jack He [Thu, 14 Dec 2017 00:32:33 +0000 (00:32 +0000)]
HFP: Fix static check errors am: 6545d3f346
am: 1c6f29b581

Change-Id: Ie16c6fe92ccdef7280d83edf913cbc1bae9372a7

6 years agoHFP: Fix static check errors
Jack He [Thu, 14 Dec 2017 00:18:36 +0000 (00:18 +0000)]
HFP: Fix static check errors
am: 6545d3f346

Change-Id: I94c8a817b847f7a4136d5c150db6044c55188893

6 years agoHFP: Fix static check errors
Jack He [Tue, 12 Dec 2017 03:49:30 +0000 (19:49 -0800)]
HFP: Fix static check errors

* In bta/ag and btif/btif_hf.cc
* Simplify boolean values
* Use nullptr intead of NULL
* Use C++ style include headers instead of C style ones
* Remove unused struct definitions
* Remove unused code from bta_ag_ci.h/cc
* Use range based for-loop when it can be converted automatically
* Use C++ style zero-initialization instead of memset so that non-POD
  members of structs can be initialized properly
* Use "" to initliaze char array since the rest of the array will be
  zero padded if the array is assigned to a shorter string than its
  length

Bug: 68340193
Test: make, connect to HFP enabled device
Change-Id: I25c1e48ca1cb40629b9b60243ec462f498d8fc24

6 years agoMerge "Bump GATT cache file version marker" am: 4edb5857bc
Jakub Pawlowski [Wed, 13 Dec 2017 22:07:12 +0000 (22:07 +0000)]
Merge "Bump GATT cache file version marker" am: 4edb5857bc
am: d693a71833

Change-Id: I0f6e5bdb24ef6a6dff88b09288e1e70413813705

6 years agoMerge "Bump GATT cache file version marker"
Jakub Pawlowski [Wed, 13 Dec 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Bump GATT cache file version marker"
am: 4edb5857bc

Change-Id: Ie2636872c56069c558e236fda9877d2be5d049cc

6 years agoMerge "Bump GATT cache file version marker"
Treehugger Robot [Wed, 13 Dec 2017 21:54:02 +0000 (21:54 +0000)]
Merge "Bump GATT cache file version marker"

6 years agoBump GATT cache file version marker
Jakub Pawlowski [Wed, 13 Dec 2017 18:02:32 +0000 (10:02 -0800)]
Bump GATT cache file version marker

In commit 819e2ecb84, the type used for UUID in the GATT cache was changed
from tBT_UUID to bluetooth:Uuid. This changed the binary representation of
this field. 18 bytes were used previously, now only 16 bytes are used.
This change made GATT cache file format incompatible between Android
versions, and requires an increment of cache file format version.

Fixes: 70297056
Test: added GattCacheTest
Change-Id: I4bceada300dbe3aab10d14df2aa853e4573c536e

6 years agoMerge "Fix callback type mismatches in Bluetooth" am: f527f08e4f
Vishwath Mohan [Wed, 13 Dec 2017 21:08:28 +0000 (21:08 +0000)]
Merge "Fix callback type mismatches in Bluetooth" am: f527f08e4f
am: 531cb7585c

Change-Id: Ib8f36cdb248fe94d1467be0207419d4084170e57

6 years agoAdded check to know the status of any ongoing pairing status. am: 6cc4234169
Matadeen Mishra [Wed, 13 Dec 2017 21:08:01 +0000 (21:08 +0000)]
Added check to know the status of any ongoing pairing status. am: 6cc4234169
am: 56f9b89cbd

Change-Id: I74683ee03a9c2fc129e9db25100961bfe960b279

6 years agoMerge "Fix callback type mismatches in Bluetooth"
Vishwath Mohan [Wed, 13 Dec 2017 21:05:02 +0000 (21:05 +0000)]
Merge "Fix callback type mismatches in Bluetooth"
am: f527f08e4f

Change-Id: I8963109fe921b84fcfa31f096a26ffd420af182a

6 years agoAdded check to know the status of any ongoing pairing status.
Matadeen Mishra [Wed, 13 Dec 2017 21:04:37 +0000 (21:04 +0000)]
Added check to know the status of any ongoing pairing status.
am: 6cc4234169

Change-Id: If0868cfe6d496027199f040ba72175a603353776

6 years agoMerge "Fix callback type mismatches in Bluetooth"
Vishwath Mohan [Wed, 13 Dec 2017 21:00:31 +0000 (21:00 +0000)]
Merge "Fix callback type mismatches in Bluetooth"

6 years agoAdded check to know the status of any ongoing pairing status.
Matadeen Mishra [Tue, 21 Jun 2016 12:27:31 +0000 (17:57 +0530)]
Added check to know the status of any ongoing pairing status.

Use Case: Host allows incoming pairing even though outgoing pairing
is in process.

Steps:
1. Initiate bonding from Mecapp and provide pin key at Mecapp pairing
pop-up.
2. Start pairing for Logitech mouse from DUT and click on accept
pairing at mecapp pairing pop-up.
3. Give the same pin key for mecapp pairing pop-up at DUT side and
observe the behavior.

Failure: Incoming request is getting from remote and got a pop-up
for PIN request.

Root Cause: Pairing was auto accepted for remote device while
pairing was in progress with another remote device leading to
inconsistent behavior.

Fix: Rejects incoming pairing request from remote device
if already in pairing state.

Test: Tested with HID Logitech Mouse

Fixes: 35417665

Change-Id: I19a2a98e4ceb51cabaef279a2e3f8224fbed9ea1

6 years agoFix callback type mismatches in Bluetooth
Vishwath Mohan [Mon, 4 Dec 2017 21:28:06 +0000 (13:28 -0800)]
Fix callback type mismatches in Bluetooth

This CL fixes some mismatches between defined callback signatures and
the signatures of the functions that are actually passed in as that
type.

Bug: 67507323
Test: lunch walleye_cfi && m -j50

Change-Id: Ia5c22ac614c34cc8bd8a370861d988bb9f8034a6

6 years agoMerge "BLE: Don't set SC bit in AuthReq for Legacy Devices" am: 9d4686bd2f
Hemant Gupta [Wed, 13 Dec 2017 02:55:15 +0000 (02:55 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices" am: 9d4686bd2f
am: ccdba8bdb5

Change-Id: I84b8fb11dbd5f82bc11405f0d4d5a9d78b7ab0da

6 years agoMerge "Check MT call setup state before starting ring timer" am: 964542b8e6
Satish Kodishala [Wed, 13 Dec 2017 02:54:46 +0000 (02:54 +0000)]
Merge "Check MT call setup state before starting ring timer" am: 964542b8e6
am: 2fa8382fac

Change-Id: I22bc5f0fa848f125cc34fe353aa8e24d65f20108

6 years agoMerge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
Hemant Gupta [Wed, 13 Dec 2017 01:58:11 +0000 (01:58 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
am: 9d4686bd2f

Change-Id: I8613157bff638cef511af4b29cf0adc5902a7911

6 years agoMerge "Check MT call setup state before starting ring timer"
Satish Kodishala [Wed, 13 Dec 2017 01:57:44 +0000 (01:57 +0000)]
Merge "Check MT call setup state before starting ring timer"
am: 964542b8e6

Change-Id: I9e2be9fba8c802e933ea853dc0130d8271ba252f

6 years agoMerge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
Treehugger Robot [Wed, 13 Dec 2017 01:21:23 +0000 (01:21 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"

6 years agoMerge "Check MT call setup state before starting ring timer"
Treehugger Robot [Wed, 13 Dec 2017 00:31:35 +0000 (00:31 +0000)]
Merge "Check MT call setup state before starting ring timer"

6 years agoBLE: Don't set SC bit in AuthReq for Legacy Devices
Hemant Gupta [Wed, 6 Dec 2017 10:05:20 +0000 (15:35 +0530)]
BLE: Don't set SC bit in AuthReq for Legacy Devices

Disable SC bit for legacy LE devices (< 4.2) since as per earlier
spec, this BIT should be 0 and ignored by remote device. Some remote
legacy devices which don't follow the approach of ignoring these bits
(if set) go in bad state and result in SMP pairing failure.

Test: Pairing succeeds with remote device after resettings SC bit.

Fixes: 70259025
Change-Id: I35838c60fb08916a141f764b3e1922d277b99f28

6 years agoAVRCP: Flush the command queue in AVRC_Close am: a701c777af
Myles Watson [Tue, 12 Dec 2017 19:50:24 +0000 (19:50 +0000)]
AVRCP: Flush the command queue in AVRC_Close am: a701c777af
am: 1355755aa0

Change-Id: Ic7432a2c90a66d6498bac4994a75b1628c3c27ac

6 years agoAVRCP: Flush the command queue in AVRC_Close
Myles Watson [Tue, 12 Dec 2017 19:46:49 +0000 (19:46 +0000)]
AVRCP: Flush the command queue in AVRC_Close
am: a701c777af

Change-Id: I1fdbe972e912ca1a06e6b83e336080733a0b5cf1

6 years agoAVRCP: Flush the command queue in AVRC_Close
Myles Watson [Tue, 12 Dec 2017 00:23:21 +0000 (16:23 -0800)]
AVRCP: Flush the command queue in AVRC_Close

Test: toggle BR/EDR, manually inspect open files using lsof
Change-Id: I7bdc3a3840e7cc31894a9050dd5b7c29f863bb30

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (3/3)" am: eb9d2cff70
Hansong Zhang [Tue, 12 Dec 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)" am: eb9d2cff70
am: f6eef672cd

Change-Id: I4dbc0ed7c1a6fc97eedafa5a637c53dac8f6d878

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (3/3)"
Hansong Zhang [Tue, 12 Dec 2017 19:12:15 +0000 (19:12 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"
am: eb9d2cff70

Change-Id: I3e129b74d7cb224754d35e0be01c1f73be361ea4

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (3/3)"
Treehugger Robot [Tue, 12 Dec 2017 19:02:26 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"

6 years agobinder: Call writeParcelFileDescriptor() am: be797989f1
Myles Watson [Sat, 9 Dec 2017 03:07:11 +0000 (03:07 +0000)]
binder: Call writeParcelFileDescriptor() am: be797989f1
am: f75c993b8e

Change-Id: Ic000e817698ceb2caaaad78f3c746977c9a244b2

6 years agobinder: Call writeParcelFileDescriptor()
Myles Watson [Sat, 9 Dec 2017 03:02:04 +0000 (03:02 +0000)]
binder: Call writeParcelFileDescriptor()
am: be797989f1

Change-Id: I642871e90d7c3350a21f2b2641b6a1575c68a326

6 years agobinder: Call writeParcelFileDescriptor()
Myles Watson [Fri, 8 Dec 2017 23:50:49 +0000 (15:50 -0800)]
binder: Call writeParcelFileDescriptor()

Fixes: 69678755
Test: manual inspection using lsof
Change-Id: Ifcb5af2d5797e667c20d4c41ad836cf7626e9909

6 years agoMake BluetoothPbap implement BluetoothProfile (3/3)
Hansong Zhang [Sat, 9 Dec 2017 00:08:34 +0000 (16:08 -0800)]
Make BluetoothPbap implement BluetoothProfile (3/3)

Change AIDL method signatures:
* Removed connect()
* Add BluetoothDevice parameter for disconnect()
* Rename other method names to be consistent with BluetoothProfile
methods

Test: test with PBAP carkits
Bug: 69417672
Change-Id: Ide81254d71128b9d204b63aa60bc39752add6edd

6 years agoMerge "HFP: Remove dead code in native interface" am: 2fbb2e982e
Jack He [Fri, 8 Dec 2017 01:48:37 +0000 (01:48 +0000)]
Merge "HFP: Remove dead code in native interface" am: 2fbb2e982e
am: 02e8c84a46

Change-Id: Iae1ea2008cb74d9a51ea872f87ffcc495e3baf6d

6 years agoMerge "HFP: Remove dead code in native interface"
Jack He [Fri, 8 Dec 2017 01:37:44 +0000 (01:37 +0000)]
Merge "HFP: Remove dead code in native interface"
am: 2fbb2e982e

Change-Id: Id8a4f4b3446b77f4ea57b3af8e900c48065c3f45

6 years agoMerge "HFP: Remove dead code in native interface"
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "HFP: Remove dead code in native interface"

6 years agoMerge "Make LE CoC Maximum PDU Size configurable" am: bde88fa29c
Jakub Pawlowski [Thu, 7 Dec 2017 22:34:34 +0000 (22:34 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable" am: bde88fa29c
am: 4748b50e43

Change-Id: I89d86e5b1c2b2a4a8670050ce16d7c9649896cb2

6 years agoMerge "Make LE CoC Maximum PDU Size configurable"
Jakub Pawlowski [Thu, 7 Dec 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"
am: bde88fa29c

Change-Id: I5a898bd5f71dcaf00674125ee25d6e80247660d1

6 years agoMerge "Make LE CoC Maximum PDU Size configurable"
Treehugger Robot [Thu, 7 Dec 2017 22:20:51 +0000 (22:20 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"

6 years agoMake LE CoC Maximum PDU Size configurable
Jakub Pawlowski [Tue, 5 Dec 2017 07:17:49 +0000 (23:17 -0800)]
Make LE CoC Maximum PDU Size configurable

Hearing Aid will need to modify this value. For existing code keep the
value as is.

Test: none
Bug: 69623109
Change-Id: I8c97882b5dd08a049d3a958c51163bad41df4d6a

6 years agoMerge "BTIF: Fix return types of interface getters" am: 946ddd2770
Jack He [Thu, 7 Dec 2017 20:37:01 +0000 (20:37 +0000)]
Merge "BTIF: Fix return types of interface getters" am: 946ddd2770
am: 6f3e31b153

Change-Id: I85486eaeacb5fe51e0ad8b847e89b59a41e5ebd9