OSDN Git Service

android-x86/system-bt.git
6 years agoMerge "btm_sec_disconnected Check if p_dev_rec is still in scope"
Bailey Forrest [Fri, 19 Jan 2018 20:30:27 +0000 (20:30 +0000)]
Merge "btm_sec_disconnected Check if p_dev_rec is still in scope"
am: d6dad56b4b

Change-Id: Iae71e17f3bcf081758d1b9ea85a81a9d43c341c0

6 years agoMerge "btm_sec_disconnected Check if p_dev_rec is still in scope"
Treehugger Robot [Fri, 19 Jan 2018 20:25:28 +0000 (20:25 +0000)]
Merge "btm_sec_disconnected Check if p_dev_rec is still in scope"

6 years agoRemove casts for callbacks
Myles Watson [Fri, 19 Jan 2018 19:29:03 +0000 (19:29 +0000)]
Remove casts for callbacks
am: fc9eced9bc

Change-Id: I4b512ee541e3a32f323cc29d10f51e9e1b8971d3

6 years agoMake GAP_ConnWriteData accept BT_HDR
Jakub Pawlowski [Fri, 19 Jan 2018 19:28:45 +0000 (19:28 +0000)]
Make GAP_ConnWriteData accept BT_HDR
am: 42bdd07088

Change-Id: If4572b3d43c1076feea8ac07032454fcb1b4f535

6 years agoRemove casts for callbacks
Myles Watson [Thu, 18 Jan 2018 20:30:55 +0000 (12:30 -0800)]
Remove casts for callbacks

Casting callbacks can hide parameter mismatches from
the compiler, which makes it impossible to check
argument types.

Bug: 72005262
Test: Toggle Bluetooth, connect to a headset
Change-Id: I0c3e0653c77e829655377fbf170d1b03efa5ea32

6 years agobtm_sec_disconnected Check if p_dev_rec is still in scope
Bailey Forrest [Fri, 12 Jan 2018 23:52:14 +0000 (15:52 -0800)]
btm_sec_disconnected Check if p_dev_rec is still in scope

|btm_sec_disconnected| may call the callback
|btm_cb.api.p_auth_complete_callback| which can delete |p_dev_rec|.
After deletion, |btm_sec_disconnected| still atempts to use |p_dev_rec|.

Bug: 71913396
Test: Does not crash with a quickly terminated connection.
Change-Id: Ic28beb2888a51090283be04121d785495cf25a84

6 years agoMake GAP_ConnWriteData accept BT_HDR
Jakub Pawlowski [Thu, 18 Jan 2018 02:22:12 +0000 (18:22 -0800)]
Make GAP_ConnWriteData accept BT_HDR

This is next step towards making LE sockets work with zero copies.

Test: transfer file using OPP
Bug: 68359837
Change-Id: Iedcdd59acb223e2982f6cb96b8656f517008dee5

6 years agoRevert "HID: Update condition for checking LE HID handle validity"
Hemant Gupta [Fri, 19 Jan 2018 01:07:38 +0000 (01:07 +0000)]
Revert "HID: Update condition for checking LE HID handle validity"
am: 812d20dfd8

Change-Id: Ia541465ba62f3a0c7bb890290f1b2a03925f2756

6 years agoAdded support for new Android API for LE CoC
Stanley Tng [Thu, 18 Jan 2018 17:59:28 +0000 (17:59 +0000)]
Added support for new Android API for LE CoC
am: 49dd53cb3d

Change-Id: If4aa43d5571db2f4c41d1851a486a42804a9efca

6 years agoRevert "HID: Update condition for checking LE HID handle validity"
Hemant Gupta [Fri, 12 Jan 2018 06:25:47 +0000 (11:55 +0530)]
Revert "HID: Update condition for checking LE HID handle validity"

This reverts commit af94891aa6e66b0d4b495d60aeac2aa8091c9d33 as changes to
fix same issue already merged via commit 2e3c3d782993c475e608291896db73b0960fa9dd
so this patch is not longer required.

Test: Code analysis for aosp master

Fixes: 71842479
Change-Id: Ifbc2375ad6df7231c85ef30c5e2c5b5d8dde16f0

6 years agoAdded support for new Android API for LE CoC
Stanley Tng [Wed, 20 Dec 2017 17:38:30 +0000 (09:38 -0800)]
Added support for new Android API for LE CoC

Added support for the new Android API including the management of the
LE_PSM values.
Also fixed a bug when de-registering the L2CAP CoC, the RCB is not
freed correctly.

Test: Ran the new ACTS Tests for LE CoC and existing ACTS for RfComm
Bug: 70683224
Change-Id: I5a545656bece667e7ba942d7b2334e3f5b49b283

6 years agoLimit data accepted by GAP_ConnWriteData to just one SDU
Jakub Pawlowski [Thu, 18 Jan 2018 13:31:31 +0000 (13:31 +0000)]
Limit data accepted by GAP_ConnWriteData to just one SDU
am: ce5f485e67

Change-Id: I6d91324e7b8347d745a358394403258d02456bae

6 years agoMerge "Make BTA_JvL2capWrite take ownership of the data buffer"
Jakub Pawlowski [Thu, 18 Jan 2018 02:16:04 +0000 (02:16 +0000)]
Merge "Make BTA_JvL2capWrite take ownership of the data buffer"
am: 00fa787f83

Change-Id: I139a9c76519330023825464558ee47e62f10ace0

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()"
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:42 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am: 94b769b9f3

Change-Id: I67191c51f005479e8fc16ee24789da1bba8db4ce

6 years agoLimit data accepted by GAP_ConnWriteData to just one SDU
Jakub Pawlowski [Fri, 12 Jan 2018 11:19:33 +0000 (03:19 -0800)]
Limit data accepted by GAP_ConnWriteData to just one SDU

This limit is already enforced in BluetoothSocket.java, which is
dividing data into pieces no bigger than MTU.

This is first step towards making it accept BT_HDR with data, in order
to make LE sockets work with zero copies.

Test: transfer file using OPP
Bug: 68359837
Change-Id: I67bfd4ab5c2dc6aa8210058a742c57e1ccf845a0

6 years agoMerge "Make BTA_JvL2capWrite take ownership of the data buffer"
Treehugger Robot [Thu, 18 Jan 2018 01:49:54 +0000 (01:49 +0000)]
Merge "Make BTA_JvL2capWrite take ownership of the data buffer"

6 years agoFix buffer overflow in GAP_ConnWriteData
Jakub Pawlowski [Thu, 18 Jan 2018 01:18:45 +0000 (01:18 +0000)]
Fix buffer overflow in GAP_ConnWriteData
am: 00c922a091

Change-Id: Ice8b45329a9351542d1cecc1cb4b5e3429f45a79

6 years agoMerge "Added internal API getMaxConnectedAudioDevices()"
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"

6 years agoMake BTA_JvL2capWrite take ownership of the data buffer
Jakub Pawlowski [Thu, 11 Jan 2018 15:34:39 +0000 (07:34 -0800)]
Make BTA_JvL2capWrite take ownership of the data buffer

This is first step towards making it accept BT_HDR with data, in order
to make LE sockets work with zero copies.

Bug: 68359837
Test: transfer file using OPP
Change-Id: Ib202520554bbc83cb8587bf1c4caa4b0da6b266c

6 years agoFix buffer overflow in GAP_ConnWriteData
Jakub Pawlowski [Mon, 8 Jan 2018 21:06:45 +0000 (13:06 -0800)]
Fix buffer overflow in GAP_ConnWriteData

Bug: none
Test: exchange data with MPS>11000, sent file between devices using OPP
Change-Id: Ie456a35da4764bdac329135742634ce8f0a63469

6 years agoAdded internal API getMaxConnectedAudioDevices()
Pavlin Radoslavov [Wed, 17 Jan 2018 10:19:42 +0000 (02:19 -0800)]
Added internal API getMaxConnectedAudioDevices()

The API can be used to obtain the maximum number of connected
devices for A2DP or HFP.

Test: Manual
Bug: 64767509

Change-Id: Ide01ea91bc9708b20c78266d791d4775be3f943d

6 years agoMerge "Revert "Fix buffer overflow in GAP_ConnWriteData""
Hansong Zhang [Wed, 17 Jan 2018 01:40:04 +0000 (01:40 +0000)]
Merge "Revert "Fix buffer overflow in GAP_ConnWriteData""
am: 115a92883d

Change-Id: I27c3e98dce3a2f3eb4ce44c2b7f4c0726f8fb76d

6 years agoMerge "Revert "Fix buffer overflow in GAP_ConnWriteData""
Treehugger Robot [Wed, 17 Jan 2018 01:33:46 +0000 (01:33 +0000)]
Merge "Revert "Fix buffer overflow in GAP_ConnWriteData""

6 years agoRevert "Fix buffer overflow in GAP_ConnWriteData"
Hansong Zhang [Tue, 16 Jan 2018 23:57:27 +0000 (23:57 +0000)]
Revert "Fix buffer overflow in GAP_ConnWriteData"

This reverts commit 9f9c47683e28a0cf99b308deeac04073a9528c59.

Reason for revert: Bluetooth OPP crashing.

Bug: 72049058
Change-Id: Ic9ee9f28ce480453a9e01d3273595bff2264cd2b

6 years agoMerge "Refactor l2c_lcc_get_next_xmit_sdu_seg"
Jakub Pawlowski [Fri, 12 Jan 2018 00:20:58 +0000 (00:20 +0000)]
Merge "Refactor l2c_lcc_get_next_xmit_sdu_seg"
am: 950dd0323e

Change-Id: I1051f0dfbad2dbda72f5b13f22dbffeb00975597

6 years agoMerge "L2CAP: Add parameter to indicate last piece of an SDU"
Jakub Pawlowski [Fri, 12 Jan 2018 00:20:37 +0000 (00:20 +0000)]
Merge "L2CAP: Add parameter to indicate last piece of an SDU"
am: 27a288f89b

Change-Id: Iad84b098036daf43758d0f7ae8c264412a470a57

6 years agoMerge "Refactor l2c_lcc_get_next_xmit_sdu_seg"
Treehugger Robot [Thu, 11 Jan 2018 23:28:37 +0000 (23:28 +0000)]
Merge "Refactor l2c_lcc_get_next_xmit_sdu_seg"

6 years agoMerge "L2CAP: Add parameter to indicate last piece of an SDU"
Treehugger Robot [Thu, 11 Jan 2018 23:21:44 +0000 (23:21 +0000)]
Merge "L2CAP: Add parameter to indicate last piece of an SDU"

6 years agoRefactor l2c_lcc_get_next_xmit_sdu_seg
Jakub Pawlowski [Wed, 10 Jan 2018 11:11:33 +0000 (03:11 -0800)]
Refactor l2c_lcc_get_next_xmit_sdu_seg

* use "PDU" instead of "segment" in variable names
* simplify computation of first_pdu, last_pdu, no_of_bytes_to_send
* remove unnecessary null checks

Test: manual
Bug: 68359837
Change-Id: Iecf511df2a51c2c103ecb3b524c6ed17910a7062

6 years agoL2CAP: Add parameter to indicate last piece of an SDU
Jakub Pawlowski [Wed, 10 Jan 2018 10:54:47 +0000 (02:54 -0800)]
L2CAP: Add parameter to indicate last piece of an SDU

This information will be used in future patches to notify packet
completition to upper layers.

Test: manual
Bug: 68359837
Change-Id: Ie4aa937b4da5aa83fa552a8603195a6933d64cc6

6 years agoHID: Update condition for checking LE HID handle validity
Hemant Gupta [Thu, 11 Jan 2018 19:05:11 +0000 (19:05 +0000)]
HID: Update condition for checking LE HID handle validity
am: af94891aa6

Change-Id: I9036068c749c5d35b3605a68db0f79293a3d9c37

6 years agoHID: Update condition for checking LE HID handle validity
Hemant Gupta [Thu, 11 Jan 2018 09:52:49 +0000 (15:22 +0530)]
HID: Update condition for checking LE HID handle validity

1) Pair and connect with BR/EDR HID devices and LE devices
   such that the total number of connected paired devices
   becomes 7. It is not required that connection to all devices be
   maintained, they can be disconnected as well afterwards.
2) Pair and connect with a new LE device. Connection fails
3) Retry connecting to same LE device. Connection does not go through
4) Turn BT off

Observed Result:
1) LE device cannot be connected in step 2
2) Tombstone in BT while switching off BT with below signature

backtrace:
    #00 pc 0000000000092438  /system/lib64/libc.so (ifree+88)
    #01 pc 000000000009298c  /system/lib64/libc.so (je_free+120)
    #02 pc 00000000001b266c  /system/lib64/hw/bluetooth.default.so (_Z18osi_free_and_resetPPv+84)
    #03 pc 0000000000062f84  /system/lib64/hw/bluetooth.default.so
    (_Z17bta_hh_sm_executeP14tBTA_HH_DEV_CBtP12tBTA_HH_DATA+880)
    #04 pc 0000000000063120  /system/lib64/hw/bluetooth.default.so (_Z16bta_hh_hdl_eventP6BT_HDR+296)
    #05 pc 000000000007bbc4  /system/lib64/hw/bluetooth.default.so (_Z13bta_sys_eventP6BT_HDR+60)
    #06 pc 00000000001b4d88  /system/lib64/hw/bluetooth.default.so (_ZL22internal_dequeue_readyPv+80)
    #07 pc 00000000001b96f4  /system/lib64/hw/bluetooth.default.so (_ZL11run_reactorP9reactor_ti+312)
    #08 pc 00000000001b9590  /system/lib64/hw/bluetooth.default.so (_Z13reactor_startP9reactor_t+80)
    #09 pc 00000000001baf24  /system/lib64/hw/bluetooth.default.so (_ZL10run_threadPv+256)
    #10 pc 0000000000067bc4  /system/lib64/libc.so (_ZL15__pthread_startPv+36)
    #11 pc 000000000001f264  /system/lib64/libc.so (__start_thread+68)

Root Cause:
Wrong conditional check in macro BTA_HH_IS_LE_DEV_HDL_VALID which ignores the condition that max
14 HID devices can be connected and all of them can be LE as well.

Fix:
Update the condition in macro BTA_HH_IS_LE_DEV_HDL_VALID to compare with BTA_HH_MAX_DEVICE instead of
BTA_HH_LE_MAX_KNOWN

Test: Not yet performed, only code and log analysis

Fixes: 71842479
Change-Id: I2b56b6f109787608e25c340150be313f0f5397be

6 years agoFix buffer overflow in GAP_ConnWriteData
Jakub Pawlowski [Thu, 11 Jan 2018 15:51:37 +0000 (15:51 +0000)]
Fix buffer overflow in GAP_ConnWriteData
am: 9f9c47683e

Change-Id: Iae50fac27ce79a0a8ef002f465fcf0db59119c79

6 years agoFix buffer overflow in GAP_ConnWriteData
Jakub Pawlowski [Mon, 8 Jan 2018 21:06:45 +0000 (13:06 -0800)]
Fix buffer overflow in GAP_ConnWriteData

Bug: none
Test: exchange data with MPS>11000
Change-Id: I01c60d6f08529be051e921789c41f7065f45534f

6 years agoRemove duplicated code in l2cap_sock - on_l2cap_write_fixed_done
Jakub Pawlowski [Wed, 10 Jan 2018 21:05:02 +0000 (21:05 +0000)]
Remove duplicated code in l2cap_sock - on_l2cap_write_fixed_done
am: 19d30611c4

Change-Id: I595e4b78830248ef813fc285647cfb9f4e8be30a

6 years agoRemove duplicated code in l2cap_sock - on_l2cap_write_fixed_done
Jakub Pawlowski [Mon, 8 Jan 2018 09:23:52 +0000 (01:23 -0800)]
Remove duplicated code in l2cap_sock - on_l2cap_write_fixed_done

Test: none
Bug: 68359837
Change-Id: Ic3ebe0b7eebbd0122e7f7751ab3b48d6acf62da6

6 years agoMerge "Move repeated code from l2cu_check_channel_congestion into a separate function"
Jakub Pawlowski [Wed, 10 Jan 2018 13:09:56 +0000 (13:09 +0000)]
Merge "Move repeated code from l2cu_check_channel_congestion into a separate function"
am: 8b2fed1b27

Change-Id: I51d9f87d4653d5d94ad0c1a9020de147ca092f25

6 years agoMerge "Move repeated code from l2cu_check_channel_congestion into a separate function"
Treehugger Robot [Wed, 10 Jan 2018 13:04:58 +0000 (13:04 +0000)]
Merge "Move repeated code from l2cu_check_channel_congestion into a separate function"

6 years agoMerge "Make AdvertiseManager shutdown gracefully"
Jakub Pawlowski [Wed, 10 Jan 2018 10:52:40 +0000 (10:52 +0000)]
Merge "Make AdvertiseManager shutdown gracefully"
am: b17a48392c

Change-Id: Ie59144e16b00c6949e0bbcbe2fc51cde5702f13c

6 years agoMerge "Make AdvertiseManager shutdown gracefully"
Treehugger Robot [Wed, 10 Jan 2018 10:48:27 +0000 (10:48 +0000)]
Merge "Make AdvertiseManager shutdown gracefully"

6 years agoMerge "HFP: Print human readable event and state name by default"
Jack He [Wed, 10 Jan 2018 03:55:27 +0000 (03:55 +0000)]
Merge "HFP: Print human readable event and state name by default"
am: 6d6cf5fb43

Change-Id: I1a89332766159d79f025278967021290ff2df183

6 years agoMerge "HFP: Remove used BTA call-in events and methods"
Jack He [Wed, 10 Jan 2018 03:55:02 +0000 (03:55 +0000)]
Merge "HFP: Remove used BTA call-in events and methods"
am: 5608f53c83

Change-Id: If9ab82df01142945f1e790d20278c35c0848cd36

6 years agoMerge "HFP: Print human readable event and state name by default"
Treehugger Robot [Wed, 10 Jan 2018 03:47:04 +0000 (03:47 +0000)]
Merge "HFP: Print human readable event and state name by default"

6 years agoMerge "HFP: Remove used BTA call-in events and methods"
Treehugger Robot [Wed, 10 Jan 2018 03:46:48 +0000 (03:46 +0000)]
Merge "HFP: Remove used BTA call-in events and methods"

6 years agoMerge "Fix SIGSEGV during Hands-free client SDP"
Lianchao Song [Wed, 10 Jan 2018 02:45:49 +0000 (02:45 +0000)]
Merge "Fix SIGSEGV during Hands-free client SDP"
am: 853a841341

Change-Id: I0b8496cfdcb2aa3086e7d59a3d7cb62078997f4f

6 years agoMerge "Fix SIGSEGV during Hands-free client SDP"
Treehugger Robot [Wed, 10 Jan 2018 02:40:49 +0000 (02:40 +0000)]
Merge "Fix SIGSEGV during Hands-free client SDP"

6 years agoHFP: Print human readable event and state name by default
Jack He [Sun, 7 Jan 2018 01:00:37 +0000 (17:00 -0800)]
HFP: Print human readable event and state name by default

* Debug log in HFP's BTA code is gated by BTA_AG_SCO_DEBUG and
  BTA_AG_DEBUG flags. These are non-standard flags that must be
  configured at compile time. Instead, debug logs should be gated by
  flags in bt_stack.conf only
* This change enables human readable debug output by default by removing
  these flags, and refactor the string conversion functions

Bug: 70538124
Test: runtest bluetooth, native unit tests
Change-Id: I99fd00016020a9c6b14928906f07bca4f0ea482d

6 years agoHFP: Remove used BTA call-in events and methods
Jack He [Wed, 10 Jan 2018 00:25:46 +0000 (16:25 -0800)]
HFP: Remove used BTA call-in events and methods

* Since SCO over HCI is temporarily unsupported on the stack, SCO data
  call-in methods are no longer used by the stack and thus should be
  removed. For example, bta_ag_ci_sco_data() and BTA_AG_CI_SCO_DATA_EVT.
* Since raw RFCOMM access is disabled, various RFCOMM data call-in
  methods are no longer used by the stack and thus should be removed.
  For example, bta_ag_ci_rx_data() and BTA_AG_CI_RX_WRITE_EVT

Bug: 70538124
Test: runtest bluetooth, native unit test
Change-Id: Iacd60042e97b1be5f800319723836285eb68b2b9

6 years agoHFP: Remove AG RFCOMM data pass through mode
Jack He [Wed, 10 Jan 2018 00:18:52 +0000 (00:18 +0000)]
HFP: Remove AG RFCOMM data pass through mode
am: 3f10b14ea5

Change-Id: Ic686cb919a37a9a6418ed56ce7f8d9da1d43211c

6 years agoHFP: Remove redundant AG data callout code
Jack He [Wed, 10 Jan 2018 00:18:45 +0000 (00:18 +0000)]
HFP: Remove redundant AG data callout code
am: c4829e81df

Change-Id: I11e7c92839657477654ff7838df050cbdbd1ad13

6 years agoHFP: Add isInbandRingingEnabled() API (3/4)
Jack He [Wed, 10 Jan 2018 00:18:38 +0000 (00:18 +0000)]
HFP: Add isInbandRingingEnabled() API (3/4)
am: 02b28fba44

Change-Id: I49ad1510c1bdf6c9ad44c3611ebdcb13e4ee8eb0

6 years agoHFP: Remove AG RFCOMM data pass through mode
Jack He [Sat, 6 Jan 2018 23:53:29 +0000 (15:53 -0800)]
HFP: Remove AG RFCOMM data pass through mode

* In BTA_AG_PASS_THROUGH mode defined in bta_ag_api.h, RFCOMM data is
  passed directly to the upper layer. In this case, AT commands are
  parsed in the user application instead of being parsed within the fluoride
  stack.
* However, this mode is never used on the stack as btif_hf.cc only call
  BTA_AgEnable() with BTA_AG_PARSE parameter value. Currently, AT
  commands are only parsed within the fluoride stack
* This change removes this feature since the pass through mode is
  never used, tested, nor maintained

Bug: 70538124
Test: runtest bluetooth, native unit tests, no functional change
Change-Id: I921d5ee950e4abadea8433c5b2d5882a99923cb0

6 years agoHFP: Remove redundant AG data callout code
Jack He [Sat, 6 Jan 2018 23:31:42 +0000 (15:31 -0800)]
HFP: Remove redundant AG data callout code

* Methods in bta_ag_co.cc are almost empty and should be removed
* Only bta_ag_co_init() calls BTM_WriteVoiceSettings(). This can be
  called directly from BTA. The callout wrapper is unnecessary

Bug: 70538124
Test: runtest bluetooth, native unit tests, no functional change
Change-Id: I20ab1c033d18f3405e7efb8446b44153b24f3cb0

6 years agoHFP: Add isInbandRingingEnabled() API (3/4)
Jack He [Sat, 6 Jan 2018 01:18:29 +0000 (17:18 -0800)]
HFP: Add isInbandRingingEnabled() API (3/4)

* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
  in-band ringing is currently enabled in the system when deciding on
  audio routes for ringtone
* Use this value obtained in Java layer to initialize native HFP/HSP
  stack instead of checking it in native layer

Bug: 71646213
Test: make, toggle in-band ringing from Development Settings and observe
      whether Telecom service tries to open SCO when there is an
      incoming call

Change-Id: I917537b6d17681151639ff29a56ac9c0c7e0e7e8

6 years agoFix SIGSEGV during Hands-free client SDP
Lianchao Song [Fri, 22 Dec 2017 08:55:47 +0000 (16:55 +0800)]
Fix SIGSEGV during Hands-free client SDP

Fixes: 70367002
Change-Id: I2fd7a00551157a000b87c7bbdbc8a2c93cff21c4

6 years agoRun by default the 64-bit unit tests on 64-bit devices
Pavlin Radoslavov [Tue, 9 Jan 2018 20:46:39 +0000 (20:46 +0000)]
Run by default the 64-bit unit tests on 64-bit devices
am: e07f3d084d

Change-Id: I14a2c0eeaec519df9bdefe3ada05c48efc3d3198

6 years agoDisable CFI verification for unit tests that are using gtest+gmock
Pavlin Radoslavov [Tue, 9 Jan 2018 20:46:33 +0000 (20:46 +0000)]
Disable CFI verification for unit tests that are using gtest+gmock
am: ee021ef64d

Change-Id: I8de3be780406fae5bb0142d3c51c83d38da4d9d3

6 years agoMove repeated code from l2cu_check_channel_congestion into a separate function
Jakub Pawlowski [Tue, 9 Jan 2018 11:45:09 +0000 (03:45 -0800)]
Move repeated code from l2cu_check_channel_congestion into a separate function

Test: compilation
Bug: 68359837
Change-Id: I69edf0d549633a2d9d0c73eae4efbaf47d302ab4

6 years agoRun by default the 64-bit unit tests on 64-bit devices
Pavlin Radoslavov [Tue, 9 Jan 2018 13:58:53 +0000 (05:58 -0800)]
Run by default the 64-bit unit tests on 64-bit devices

Bug: 71739588
Test: cd system/bt; mm -j 40; test/run_unit_tests.sh
Change-Id: Ie4206a8935456a0b62b7a4b90c7247f398a6a7ef

6 years agoDisable CFI verification for unit tests that are using gtest+gmock
Pavlin Radoslavov [Tue, 9 Jan 2018 13:36:20 +0000 (05:36 -0800)]
Disable CFI verification for unit tests that are using gtest+gmock

Apparently, the CFI verification crashes unit tests that
are using gtest+gmock. Interestingly, those tests succeed for 32-bit
binaries, and fail for 64-bit binaries.

Bug: 71739588
Test: Running the 64-bit version of the unit tests in test/run_unit_tests.sh
Change-Id: Id1f6b3667b3f9eabb0719e65aea18c6950de63a8

6 years agoMake AdvertiseManager shutdown gracefully
Jakub Pawlowski [Thu, 22 Jun 2017 16:46:18 +0000 (09:46 -0700)]
Make AdvertiseManager shutdown gracefully

If the Bluetooth stack is shutdown while AdvertiseManager has a pending HCI
operation being executed, the callback to that operation might be
executed after the manager was deleted. In order to fix any potential
issues, always use a weak pointer to the advertisement manager. This will
prevent the callbacks from getting executed.

In case of callbacks that are not executed on the AdvertiseManager
instance, one can check if the weak pointer is still valid, and properly
handle the stack shutdown.

Test: BleAdvertisingManagerTest:test_cleanup_during_execution
Change-Id: I8d33de4f64267a880880082c5498375c083addef

6 years agoPrevent LE CoC from dropping data when remote MPS>8087
Jakub Pawlowski [Mon, 8 Jan 2018 08:35:58 +0000 (08:35 +0000)]
Prevent LE CoC from dropping data when remote MPS>8087
am: 8452b05b1a

Change-Id: Ifae837ba653efab320d5f6b2b7a10fa15444a0c7

6 years agoPrevent LE CoC from dropping data when remote MPS>8087
Jakub Pawlowski [Fri, 5 Jan 2018 10:41:36 +0000 (02:41 -0800)]
Prevent LE CoC from dropping data when remote MPS>8087

When using LE Coc through Java socket, one can read MPS from
getMaxTransmitPacketSize(). If this value is bigger than
local device L2CAP_MAX_SDU_LENGTH, data sent to remote will be
truncated. This patch fixes that by using properly big buffer for
receiving data from socket on native side.

Test: connect with device with MPS bigger than MPS, alternatively set
L2CAP_MAX_SDU_LENGTH to i.e. 30 on device during test and try to write
"remote MPS" of bytes to remote device.
Bug: 68359837
Change-Id: I02bef80f0dd0f0d6850704ac7787c5f3f5b9b3ab

6 years agoHFP: Add APIs for set and get active device (3/3)
Jack He [Sat, 6 Jan 2018 17:52:41 +0000 (17:52 +0000)]
HFP: Add APIs for set and get active device (3/3)
am: 9761185772

Change-Id: I1dc0936d87b7e42f68ab7919f6b8bb245fff905b

6 years agoAdded internal API to get/set the A2DP Active Device
Pavlin Radoslavov [Sat, 6 Jan 2018 17:41:24 +0000 (17:41 +0000)]
Added internal API to get/set the A2DP Active Device
am: 5fd3e62821

Change-Id: Ie5ee734f1e471eebcaa4ce07abe35999a068736e

6 years agoHFP: Use disableinbandringing instead of enableinbandringing
Jack He [Sat, 6 Jan 2018 17:33:13 +0000 (17:33 +0000)]
HFP: Use disableinbandringing instead of enableinbandringing
am: 72804890b6

Change-Id: Ia9187da1a44978410bfcac41eb1b48eb86e2cfaf

6 years agoHFP: Add APIs for set and get active device (3/3)
Jack He [Thu, 7 Dec 2017 02:35:11 +0000 (18:35 -0800)]
HFP: Add APIs for set and get active device (3/3)

* Add set active device APIs to set active device from Java layer
* Set active device to the first connected device if no one set it
  before
* Clear active device on RFCOMM disconnection if active device is the
  one getting disconnected
* Currently, the active device value is not used in any functional code

Bug: 68951996
Test: runtest -j40 bluetooth
Change-Id: Id0c00e89178b0f963ed8642e72c7010160dd1d68

6 years agoAdded internal API to get/set the A2DP Active Device
Pavlin Radoslavov [Tue, 19 Dec 2017 21:26:22 +0000 (13:26 -0800)]
Added internal API to get/set the A2DP Active Device

1. Call BluetoothA2dp.setActiveDevice(BluetoothDevice device) to set
   a connected A2DP device as active.
2. Listen for BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intent
   that will contain the latest active device (in EXTRA_DEVICE field).
   If the active device could not be changed, the EXTRA_DEVICE
   field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
   can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothA2dp.setActiveDevice() could be called by some other parts of
   the system, so interested parties should always listen for
   BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
   for active device updates.

Bug: 71555243
Test: Manual
Change-Id: Ia25465e17a4539e940d09523cb621b230abd31e3

6 years agoHFP: Use disableinbandringing instead of enableinbandringing
Jack He [Thu, 7 Dec 2017 23:15:56 +0000 (15:15 -0800)]
HFP: Use disableinbandringing instead of enableinbandringing

* Use disableinbandringing system property as in-band ringing is enabled
  by default so an active user choice would disable it instead of
  enabling it

Bug: 65383086
Test: make, try toggling the preference and verify in-band ringing
      behavior

Change-Id: I9b10743960c933b223481d2efb68af538689c507
Merged-In: I9b10743960c933b223481d2efb68af538689c507
(cherry picked from commit 71de85091506eeeaab6e73cccf0ebd5bb06f2af1)

6 years agoRevert "Use vector instead of raw pointer in l2cap socket write handling"
Jakub Pawlowski [Fri, 5 Jan 2018 11:22:16 +0000 (11:22 +0000)]
Revert "Use vector instead of raw pointer in l2cap socket write handling"
am: a32cfc9406

Change-Id: I82bcb6ba5934527716f86347ab66a924af7d0de7

6 years agoRevert "Use vector instead of raw pointer in l2cap socket write handling"
Jakub Pawlowski [Fri, 5 Jan 2018 09:36:44 +0000 (09:36 +0000)]
Revert "Use vector instead of raw pointer in l2cap socket write handling"

This reverts commit 4da2ff53e694c5bee2973c55bb14eb40f74a9d3d.

Change-Id: Id8a399ec6f7474b92579c4647899e424feeb0d33

6 years agoUse vector instead of raw pointer in l2cap socket write handling
Jakub Pawlowski [Fri, 5 Jan 2018 07:29:10 +0000 (07:29 +0000)]
Use vector instead of raw pointer in l2cap socket write handling
am: 4da2ff53e6

Change-Id: If0bfaed0ee4d1221f9075c94c00c0ef87e756ee9

6 years agoUse vector instead of raw pointer in l2cap socket write handling
Jakub Pawlowski [Tue, 31 Oct 2017 06:15:43 +0000 (23:15 -0700)]
Use vector instead of raw pointer in l2cap socket write handling

Currently, when we receive data from upper layers for LE CoC socket,
we store it in memory and pass a raw pointer around, keeping memory
until the write is acknowledged by controller and event is sent back to
btif layer in on_l2cap_write*_done. If anything goes wrong, we might
loose the pointer to the data and have a memory leak.

From now on, we store the data in std::vector and pass its ownership
down the stack. The moment the data is copied into lower layer buffer,
vector is automatically freed. We no longer pass the data back to
on_l2cap_write*_done callback.

Bug: 68359837
Test: compilation test
Change-Id: If34c0fba8d4a040a242b8c655491b8967a03b96a

6 years agoAdd to receive BTHF_CALL_STATE_DISCONNECTED at HFP
Yasuyoshi Terui [Fri, 5 Jan 2018 05:50:20 +0000 (05:50 +0000)]
Add to receive BTHF_CALL_STATE_DISCONNECTED at HFP
am: c8da011a74

Change-Id: I5d0282479a5129150721baf6c389fafc5a26f9e1

6 years agoAdd to receive BTHF_CALL_STATE_DISCONNECTED at HFP
Yasuyoshi Terui [Fri, 14 Feb 2014 06:07:35 +0000 (15:07 +0900)]
Add to receive BTHF_CALL_STATE_DISCONNECTED at HFP

When the call is disconnected, the BTHF state is changed to IDLE and
SCO connection is disconnected before playing disconnect tone. So the
disconnect tone can't be sound from BTHS.

Add DISCONNECTED state for HFP and keep the state until disconnect tone
sounds from BT.

Test: manual - Checked whether the disconnect tone is sound from the BTHS
Bug: 69645337

Change-Id: Id96385e4ce35cfe7d0d4e14b74a2fc1a63165f82

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
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)
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"
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
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
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)"
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
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"
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
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)
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