OSDN Git Service
Jack He [Wed, 10 Jan 2018 00:27:15 +0000 (00:27 +0000)]
HFP: Remove AG RFCOMM data pass through mode am:
3f10b14ea5
am:
2daa33463d
Change-Id: Ie0c39c0c6f6f63902ee15d6b5645bab7840d53a9
Jack He [Wed, 10 Jan 2018 00:27:06 +0000 (00:27 +0000)]
HFP: Remove redundant AG data callout code am:
c4829e81df
am:
6650742194
Change-Id: I4ad9970ad146e335ce101202bbe6c5b7731b429d
Jack He [Wed, 10 Jan 2018 00:26:56 +0000 (00:26 +0000)]
HFP: Add isInbandRingingEnabled() API (3/4) am:
02b28fba44
am:
c61dbe4a8a
Change-Id: I6a047d322219faad61e8781bccf37cac0e42ff28
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
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
Jack He [Wed, 10 Jan 2018 00:18:38 +0000 (00:18 +0000)]
HFP: Add isInbandRingingEnabled() API (3/4)
am:
02b28fba44
Change-Id: I49ad1510c1bdf6c9ad44c3611ebdcb13e4ee8eb0
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
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
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
Pavlin Radoslavov [Tue, 9 Jan 2018 20:53:51 +0000 (20:53 +0000)]
Run by default the 64-bit unit tests on 64-bit devices am:
e07f3d084d
am:
c92d4961b8
Change-Id: I9266da7ce1db8a88dc864f5d107345aec5797544
Pavlin Radoslavov [Tue, 9 Jan 2018 20:53:29 +0000 (20:53 +0000)]
Disable CFI verification for unit tests that are using gtest+gmock am:
ee021ef64d
am:
6c8fb22537
Change-Id: Ia7e6804c33617ca361b3627a5b480cfdad5d99f8
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
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
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
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
Jakub Pawlowski [Mon, 8 Jan 2018 21:35:25 +0000 (21:35 +0000)]
Prevent LE CoC from dropping data when remote MPS>8087 am:
8452b05b1a
am:
0384aae7bb
Change-Id: I02a574f1794b5083307cc357298d6dc4729478a2
Jack He [Mon, 8 Jan 2018 21:14:02 +0000 (21:14 +0000)]
HFP: Add APIs for set and get active device (3/3) am:
9761185772
am:
3b45afe246
Change-Id: Ic41a49abff6ff0049a0eb28bd384798672a102b6
Pavlin Radoslavov [Mon, 8 Jan 2018 21:02:18 +0000 (21:02 +0000)]
Added internal API to get/set the A2DP Active Device am:
5fd3e62821
am:
676734bd45
Change-Id: I3fc5dd1119584a9aebcd361dd8402b7ff07f5e80
Jack He [Mon, 8 Jan 2018 20:21:00 +0000 (20:21 +0000)]
HFP: Use disableinbandringing instead of enableinbandringing am:
72804890b6
am:
985ce35907
Change-Id: I1f17a7fda94728e43d4b6b19448db787f6275a7c
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
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
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
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
Jack He [Sat, 6 Jan 2018 17:33:13 +0000 (17:33 +0000)]
HFP: Use disableinbandringing instead of enableinbandringing
am:
72804890b6
Change-Id: Ia9187da1a44978410bfcac41eb1b48eb86e2cfaf
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
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
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)
Jakub Pawlowski [Fri, 5 Jan 2018 11:24:18 +0000 (11:24 +0000)]
Revert "Use vector instead of raw pointer in l2cap socket write handling" am:
a32cfc9406
am:
ef27326ed4
Change-Id: I28400f163fad55b413a91ad79482f0749a3e84d0
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
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
Jakub Pawlowski [Fri, 5 Jan 2018 07:31:16 +0000 (07:31 +0000)]
Use vector instead of raw pointer in l2cap socket write handling am:
4da2ff53e6
am:
599477c4c8
Change-Id: I2cfcf4e886237a0c2964a28adb0fd6f041fd42d4
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
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
Yasuyoshi Terui [Fri, 5 Jan 2018 05:52:24 +0000 (05:52 +0000)]
Add to receive BTHF_CALL_STATE_DISCONNECTED at HFP am:
c8da011a74
am:
60ccd1d0b4
Change-Id: I809580e699f8fa9f740b5dba78f5cd696a072793
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
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Wed, 3 Jan 2018 18:35:35 +0000 (18:35 +0000)]
Merge "Temporarily remove broken SCO-over-HCI implementation"
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
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
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
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
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
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
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
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
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
Treehugger Robot [Thu, 21 Dec 2017 21:56:11 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (2/5)"
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
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
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
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
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
Treehugger Robot [Thu, 21 Dec 2017 15:11:56 +0000 (15:11 +0000)]
Merge "Increase default SDP_MTU_SIZE to 1024"
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)
Jakub Pawlowski [Wed, 20 Dec 2017 12:22:21 +0000 (12:22 +0000)]
Minor GATT logging fixes am:
fdae46505f
am:
bc9adf4f24
Change-Id: Id5528e6c34ccc38e2cc4fba147612a92ad7a1325
Jakub Pawlowski [Wed, 20 Dec 2017 12:19:50 +0000 (12:19 +0000)]
Minor GATT logging fixes
am:
fdae46505f
Change-Id: Ic2d7530c2650139a0c648e90aa716b691feb9768
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
Jakub Pawlowski [Wed, 13 Dec 2017 18:12:39 +0000 (10:12 -0800)]
Minor GATT logging fixes
Test: compilation
Bug:
70297056
Change-Id: If71bbb19a08abbbb30b5ce5027aed97e03b3baaa
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
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
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
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
Hidehiko Abe [Mon, 18 Dec 2017 10:34:35 +0000 (10:34 +0000)]
bt: Update libchrome APIS to r456626.
am:
aeca7aa7a7
Change-Id: I9b90c9be75ae4e7d1ed3f3602298eb29d6407e35
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
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
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
Treehugger Robot [Sat, 16 Dec 2017 00:09:34 +0000 (00:09 +0000)]
Merge "Add extra log message to print output codec config"
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
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
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"
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
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
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
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
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
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
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
Treehugger Robot [Thu, 14 Dec 2017 21:27:12 +0000 (21:27 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t"
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
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
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
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
Treehugger Robot [Thu, 14 Dec 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Fix Bluetooth crash on user switching"
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
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
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
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
Jack He [Thu, 14 Dec 2017 00:18:36 +0000 (00:18 +0000)]
HFP: Fix static check errors
am:
6545d3f346
Change-Id: I94c8a817b847f7a4136d5c150db6044c55188893
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