OSDN Git Service

android-x86/system-bt.git
7 years agobtif: Remove AVRC_CTRL_INCLUDED ifdefs
Marie Janssen [Tue, 15 Nov 2016 22:54:16 +0000 (14:54 -0800)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs

AVRCP controller side support is always included now.

Test: croot system/bt && mma -j37

Change-Id: I22260b4f123b352f70cbab54a19b5f8f5f171825

7 years agobtif: Remove unused uinput interface code
Marie Janssen [Tue, 15 Nov 2016 16:24:24 +0000 (08:24 -0800)]
btif: Remove unused uinput interface code

uinput isn't used anymore; all media commands go through the HAL

Test: croot system/bt && mma -j37

Change-Id: I83ab133794683a26e250ea10927fa95b2e2cb28a

7 years agoMerge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
Treehugger Robot [Tue, 15 Nov 2016 21:21:15 +0000 (21:21 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"

7 years agoFix a NULL-pointer check order reverse in GATTC_ConfigureMTU
liuchao [Mon, 14 Nov 2016 08:13:10 +0000 (16:13 +0800)]
Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU

This fixes a potential NULL-pointer check order reverse
in case failed to get TCB using the TCB index

Test: mm -j 8
Change-Id: I8fcc168d7d077f8df7c7abb9c325c5168fa8cd39

7 years agoNULL-pointer access before check in BTM_SetBleDataLength
liuchao [Mon, 14 Nov 2016 03:13:12 +0000 (11:13 +0800)]
NULL-pointer access before check in BTM_SetBleDataLength

This fixes a potential NULL-pointer access in case
the ACL DB for the requested BDA is not found.

Test: mm -j 8

Change-Id: I86ab66730aa0d9a143ddde851bd33a05a405bb7f

7 years agoMerge "Copying of pointer with incorrect size"
Treehugger Robot [Tue, 15 Nov 2016 02:18:44 +0000 (02:18 +0000)]
Merge "Copying of pointer with incorrect size"

7 years agoCopying of pointer with incorrect size
Sanket Agarwal [Tue, 8 Nov 2016 22:23:22 +0000 (14:23 -0800)]
Copying of pointer with incorrect size

We are passing the value in pointer (UINT_TO_PTR) hence no copy is
required for the context transfer (simply use the UINT value in the
event field instead)

Change-Id: I43625c3a4d68cd8cbadd51b1fccc4138583082b6

7 years agoRemove unused GATT_Listen
Jakub Pawlowski [Mon, 14 Nov 2016 23:57:42 +0000 (15:57 -0800)]
Remove unused GATT_Listen

Bug: 30622771
Test: still builds
Change-Id: I4003a1241e611c9c1f2a21090ea3ba7530b0643a

7 years agoReenable advertising instance after an LE advertising state change
Jakub Pawlowski [Mon, 14 Nov 2016 19:20:52 +0000 (11:20 -0800)]
Reenable advertising instance after an LE advertising state change

Ensure BleAdvertisingManager::OnAdvertisingStateChanged() is called
after an advertising state change to re-enable advertising after
a connection.

This patch also fixes the registration test, which was broken since
one more advertising instance was freed for general usage.

Test: net_test_stack_multi_adv native test
Change-Id: I76887d98cb3ec386ebc0f7fad95170b8c18b9116

7 years agoRemove useless NULL-pointer check code in l2cap_client_new
liuchao [Fri, 11 Nov 2016 07:51:39 +0000 (15:51 +0800)]
Remove useless NULL-pointer check code in l2cap_client_new

Remove the useless "error:" label and NULL-pointer check block

Test: mm -j 8

Change-Id: I218f5f1e2741a49a0fe9bec749dea2484a1df2eb

7 years agoAVRCP: unify Get{Element,Item}Attributes response.
Marie Janssen [Fri, 11 Nov 2016 17:07:04 +0000 (09:07 -0800)]
AVRCP: unify Get{Element,Item}Attributes response.

GetElementAttributes response and GetItemAttributes response share the
same format and require the same checks for length.

Test: play media on carkit, see media. especially with long items.
Bug: 32407250
Bug: 30571638
Change-Id: I8623e7d662f7a39112b7527b6f5ab63c5e32379c

7 years agoMerge "Fix how LE connection parameters are set after connecting"
Treehugger Robot [Sat, 12 Nov 2016 00:52:50 +0000 (00:52 +0000)]
Merge "Fix how LE connection parameters are set after connecting"

7 years agoUnify advertising API (1/3)
Jakub Pawlowski [Thu, 3 Nov 2016 22:41:50 +0000 (15:41 -0700)]
Unify advertising API (1/3)

This patch unifies advertising API. On startup, if VSC multi advertising
is avaliable, it will be used, otherwise
BleAdvertiserLegacyHciInterfaceImpl will be used, which provides one
advertising instance.

Test: sl4a tests are passing, all proper tests updated accordingly
Change-Id: I73753962e3a33a980e8a9a1174c8d88611a47e6b

7 years agoAlways use big endian for keeping service UUID
Jakub Pawlowski [Wed, 9 Nov 2016 01:23:11 +0000 (17:23 -0800)]
Always use big endian for keeping service UUID

When adding services to GATT database, applications should always provide
it in big endian format.

Bug: 32750783
Change-Id: I5264357bdbb6bab453b63baae6563cde86d20bac

7 years agoFix how LE connection parameters are set after connecting
Jakub Pawlowski [Fri, 11 Nov 2016 21:35:18 +0000 (13:35 -0800)]
Fix how LE connection parameters are set after connecting

This patch fixes bug introduced in commit
95075be6e95e9021c1ddd834bcf9e3771c57c217
which would cause unnecessary connection parameter update requests
to be send. It should be sent immediately after connecting only.

Bug: 32563079
Bug: 28435172
Change-Id: Ibd9301a990f12a94e8043b9c29a480f068251ba8

7 years agoHandling Authentication Failure From the lower layer
Matadeen Mishra [Wed, 23 Sep 2015 16:56:46 +0000 (22:26 +0530)]
Handling Authentication Failure From the lower layer

Use case: DUT unable to do connect with all devices in
Multipairing case.

Steps:
1. pair with HS
2. disconnect HS.
3. reconnect HS from DUT.

Failure: Authentication failure occurred due to LMP
transaction collision DUT not deleting link key which
lead to unable to connect to device.

Root Cause: Not posting the Authentication failure
event to application layer, while removing the link-key.

Fix: Post the Authentication failure event to application
and removing the link-key.

Test: code compilation.

Change-Id: I079d8ce89c1fea66f0624127514cec8405bfdd3d

7 years agoMove callback to dispatch thread
Ajay Panicker [Wed, 9 Nov 2016 03:25:43 +0000 (19:25 -0800)]
Move callback to dispatch thread

Change the thread that the timeout posts a connection request event to
so that the state machine handles calling the callback on the correct
thread to prevent a JNI crash.

Bug: 32754737
Test: Manually paired a device that normally crashes phone
Change-Id: I2c3384feaa404cc583e81b2df994b7cbd079d25d

7 years agoFix incorrect check for empty out-of-band pairing data
Jakub Pawlowski [Thu, 10 Nov 2016 23:56:46 +0000 (15:56 -0800)]
Fix incorrect check for empty out-of-band pairing data

Bug: 32780409
Test: try pairing with nRF52DK using OOB LE SC
Change-Id: I3c165843bb76c372b76bdc18a7d9226345d39037

7 years agoMerge "device: Fix multi-line comments"
Treehugger Robot [Thu, 10 Nov 2016 21:15:32 +0000 (21:15 +0000)]
Merge "device: Fix multi-line comments"

7 years agoBLE OOB Pairing - parse address type (1/5)
Jakub Pawlowski [Thu, 10 Nov 2016 00:39:10 +0000 (16:39 -0800)]
BLE OOB Pairing - parse address type (1/5)

When address type is not parsed, creating bond to devices not using
random address is impossible.

Bug: 32780409
Test: try pairing with nRF52DK using random address
Change-Id: I95c4ebc7bd03cd1b895c9f17deef2e57d8b57d2a

7 years agodevice: Fix multi-line comments
Myles Watson [Wed, 9 Nov 2016 18:27:00 +0000 (10:27 -0800)]
device: Fix multi-line comments

Test: mma -j32
Change-Id: I1df0e71cba73cfde0d973498698c7d6fa017e14a

7 years agodevice: Apply clang-format
Myles Watson [Wed, 9 Nov 2016 18:20:44 +0000 (10:20 -0800)]
device: Apply clang-format

clang-format -i --style=file device/include/* \
  device/src/* device/test/*

Test: mma -j32
Change-Id: I1a0f9e1cd838c025fca487347358cc0079265004

7 years agobta: Fix comment formatting after clang-format
Myles Watson [Wed, 9 Nov 2016 22:25:23 +0000 (14:25 -0800)]
bta: Fix comment formatting after clang-format

Test: mma -j32
Change-Id: Ic945ac421b1918527105c59674eda89afd3d4126

7 years agobta: Apply clang-format
Myles Watson [Wed, 9 Nov 2016 21:17:43 +0000 (13:17 -0800)]
bta: Apply clang-format

clang-format -i --style=file bta/*/*

(twice)

Test: mma -j32
Change-Id: Ib118b1dfb6a34f9a5bfe153d65841e9041165264

7 years agobta: Prepare include statements for clang-format
Myles Watson [Wed, 9 Nov 2016 21:04:33 +0000 (13:04 -0800)]
bta: Prepare include statements for clang-format

bta: Separate includes of different types

Include "bta_sys.h" in bta/dm/bta_dm_int.h

Test: mma -j32
Change-Id: I292bc6518230201e1175937b9c6766c19709c9d5

7 years agobta: Remove double asterisks in comments
Myles Watson [Wed, 9 Nov 2016 18:40:23 +0000 (10:40 -0800)]
bta: Remove double asterisks in comments

Double asterisks at the beginning of the line
  sed -i s,"^[*][*]"," *", bta/*/*

Double asterisks after a space
  sed -i s,"^ [*][*]\([^*]\)"," *\1", bta/*/*
  sed -i s,"^ [*][*]$"," *", bta/*/*

Test: mma -j32
Change-Id: Ib83b802c7000176683b4e7f24d1255b3c2c6c01c

7 years agoinclude: Apply clang-format
Myles Watson [Wed, 9 Nov 2016 17:47:42 +0000 (09:47 -0800)]
include: Apply clang-format

clang-format -i --style=file include/*

Test: mma -j32
Change-Id: Ibfb31af3fa82cfd6021fdc3203381b91e57bb71e

7 years agoinclude: Fix comment formatting
Myles Watson [Wed, 9 Nov 2016 17:41:48 +0000 (09:41 -0800)]
include: Fix comment formatting

In preparation for clang-format, fix a few comments that
would have been mangled.

Test: mma -j32
Change-Id: I7194818e93432f8bad4d7c114a93025e217aa694

7 years agobta: Remove executable permissions from code
Myles Watson [Tue, 8 Nov 2016 22:44:50 +0000 (14:44 -0800)]
bta: Remove executable permissions from code

Test: mma -j32
Change-Id: I2d0df65001c82b37f001ba4697e58c206f2a4b9c

7 years agoRevert "Replace pthread_mutex with std::mutex"
Pavlin Radoslavov [Tue, 8 Nov 2016 00:57:53 +0000 (00:57 +0000)]
Revert "Replace pthread_mutex with std::mutex"

This reverts commit 4b801825bd90b826fb53d51f497aba87d6d00d8c.

Change-Id: I862272c682409778dce356c8cba497ea4b78b14d

7 years agoMerge "AVRCP: Passthrough code cleanup"
Treehugger Robot [Mon, 7 Nov 2016 22:17:54 +0000 (22:17 +0000)]
Merge "AVRCP: Passthrough code cleanup"

7 years agoAVRCP: Passthrough code cleanup
Marie Janssen [Fri, 4 Nov 2016 19:36:14 +0000 (12:36 -0700)]
AVRCP: Passthrough code cleanup

Simplify the code surrounding passthrough commands and responses since
we send them all up to the upper layer now.

Test: basic AVRCP control from a carkit
Change-Id: I1d1e22454471a9948df6602b34ae767d7091197c

7 years agoMask out HFP 1.7 feature bits if peer version is <1.7
Andre Eisenbach [Sat, 5 Nov 2016 00:43:17 +0000 (17:43 -0700)]
Mask out HFP 1.7 feature bits if peer version is <1.7

Bug: 32378402
Test: manual
Change-Id: Iac8684bdfd02b18cce260bedefb829e8f7285361

7 years agoUse libaudioclient instead of libmedia
Marco Nelissen [Thu, 3 Nov 2016 17:34:08 +0000 (10:34 -0700)]
Use libaudioclient instead of libmedia

Test: build/boot

Change-Id: I8aa5cb6c5351d04daf7117cf8bb983da50d4b089
(cherry picked from commit af8b51c4061a5d0c18841195dfa1f4deaf9179b5)

7 years agoMerge "Enable AVRCP Volume commands in TG role"
Treehugger Robot [Fri, 4 Nov 2016 21:22:39 +0000 (21:22 +0000)]
Merge "Enable AVRCP Volume commands in TG role"

7 years agoMerge "Add missing brackets for "if" statement inside BTM_ConfirmReqReply()"
Treehugger Robot [Fri, 4 Nov 2016 21:11:34 +0000 (21:11 +0000)]
Merge "Add missing brackets for "if" statement inside BTM_ConfirmReqReply()"

7 years agoRestart sniff timer on AVDTP signalling channel establishment
Ayan Ghosh [Fri, 6 Dec 2013 11:41:11 +0000 (17:11 +0530)]
Restart sniff timer on AVDTP signalling channel establishment

VolksWagan UHV Preminum takes time to initiate AVDTP media channel
after AVDTP signalling channel is up. If mentioned duration exceeds
7 seconds then ACL link goes into sniff due to which A2dp Connection
fails.

With this change we make sure that when AVDTP signalling channel
is up and media channel is not connected we do not go to sniff,
which is achieved by restarting sniff timer on signalling channel up
so that link does not go to sniff in between ongoing connection.

Change-Id: Ic3f268703067155ffd55a43f320ce199641c6b3f

7 years agoMerge "Replace pthread_mutex with std::mutex"
Treehugger Robot [Fri, 4 Nov 2016 20:35:26 +0000 (20:35 +0000)]
Merge "Replace pthread_mutex with std::mutex"

7 years agoMerge "Enable incoming connection for AVRCP Controller"
Treehugger Robot [Fri, 4 Nov 2016 20:26:04 +0000 (20:26 +0000)]
Merge "Enable incoming connection for AVRCP Controller"

7 years agoMerge "Handle L2CAP disconnection on incomplete connection"
Treehugger Robot [Fri, 4 Nov 2016 19:59:37 +0000 (19:59 +0000)]
Merge "Handle L2CAP disconnection on incomplete connection"

7 years agoEnable AVRCP Volume commands in TG role
Arun Jagadish [Wed, 18 May 2016 10:34:20 +0000 (16:04 +0530)]
Enable AVRCP Volume commands in TG role

Enables the bits for AVRCP Vol UP, VOL Down and
Mute based on ICS document.

Change-Id: I50cdd97812b260812edf4d005c4dd95177d53426
Signed-off-by: Arun Jagadish <arun.jagadish@intel.com>
7 years agoAdd missing brackets for "if" statement inside BTM_ConfirmReqReply()
Jack He [Fri, 4 Nov 2016 18:18:32 +0000 (11:18 -0700)]
Add missing brackets for "if" statement inside BTM_ConfirmReqReply()

This fixes a potential NULL-pointer reference crash in case
btm_find_dev() returns NULL.

Test: mm -j 8
Change-Id: Ic154b872ca84b4e9e8bc57803a4d9ee7c1665204

7 years agoEnable incoming connection for AVRCP Controller
Anubhav Gupta [Tue, 5 May 2015 14:54:47 +0000 (20:24 +0530)]
Enable incoming connection for AVRCP Controller

 - Start listening for incoming AVRCP connection if we have
   only AVRCP Controller
 - Update default peer_features based on feature mask. In case
   of incoming AVRCP connection, SDP will be done later.
   In such a scenario default peer features sent to btif should
   be based on  features-set selected during initialization.

Test: code compilation
Change-Id: Ied8ac0673288a4423bd41500985366ddc2c567a8

7 years agoMove HDP reg_counter updates to BTIF thread
Matadeen Mishra [Wed, 3 Feb 2016 15:11:26 +0000 (20:41 +0530)]
Move HDP reg_counter updates to BTIF thread

Use case: register/unregister HDP from third party APK

Test Steps:

1.Install Any Test APK which internally registers/unregister the HDP.
2.Run Test APK.
3.Do initialization of Test APK which internally registers the HDP.
4.Force stop the Test APK.
5.And rerun the APK by going back test APK menu.
6.Now it never perform the re-register the HDP as part of initialization.

Root Cause: HDP registration related counter write operations are done
in JNI main thread, and it's been referenced in BTIF thread.Sometimes,
if the context switch to BTIF thread doesn't happen immediately after
counter increment/decrement, it may not un-register the app if the
counter becomes 0.

Fix: Fixed it by making all operations related to counter in BTIF
thread, so that de-registration happens for all HDP APPs.

Test: code compilation.

Change-Id: I71ace68a5f3d39d81b646f5f40c02ce56b9e93f0

7 years agoHandle L2CAP disconnection on incomplete connection
Srinu Jella [Wed, 16 Mar 2016 13:08:55 +0000 (18:38 +0530)]
Handle L2CAP disconnection on incomplete connection

- Sometimes before receiving the connection complete
  event from remote device, upper layer might send a
  disconnection on incomplete L2CAP connection, and expects
  notification of connection failure.

- This change notifies disconnection to upper layers with
  error in case L2CAP disconnection is received on
  incomplete L2CAP channel.

Test: code compilation.

Change-Id: I4ab675329b3d791a3f68101495a6e6d90b13bde4

7 years agoReplace pthread_mutex with std::mutex
Marie Janssen [Thu, 3 Nov 2016 01:31:55 +0000 (18:31 -0700)]
Replace pthread_mutex with std::mutex

In an effort to simplify and reduce errors, replace pthread_mutexes
with std equivalents.

Test: run unit tests & manual sanity checks
Change-Id: Ia6492b0007dca311ebd1579f52b206993b7535fd

7 years agoAdd OWNERS file
Andre Eisenbach [Fri, 4 Nov 2016 16:18:48 +0000 (09:18 -0700)]
Add OWNERS file

Change-Id: Id022d0c98ab3bddc8ceabef148a6c8d1cc4f0bc8

7 years agoMerge "Remove incorrect assert in btm_read_rssi_cb"
Treehugger Robot [Fri, 4 Nov 2016 01:39:27 +0000 (01:39 +0000)]
Merge "Remove incorrect assert in btm_read_rssi_cb"

7 years agoUse standard types instead of OI_INT* and OI_UINT* types
Jakub Pawlowski [Thu, 3 Nov 2016 22:01:28 +0000 (15:01 -0700)]
Use standard types instead of OI_INT* and OI_UINT* types

Test: mma -j45
Change-Id: Ieadd33bfe1be9439e1aeb9a7844260a6e33d8dcd

7 years agoMerge "Replace DWORD with uint32_t"
Treehugger Robot [Fri, 4 Nov 2016 00:31:49 +0000 (00:31 +0000)]
Merge "Replace DWORD with uint32_t"

7 years agoRemove incorrect assert in btm_read_rssi_cb
Andre Eisenbach [Thu, 3 Nov 2016 22:05:22 +0000 (15:05 -0700)]
Remove incorrect assert in btm_read_rssi_cb

|data| may be NULL if the RSSI request times out.
See btm_read_rssi_timeout implementation for details.

Bug: 32587130
Test: manual
Change-Id: I12ad78ecf5f5859bee7e1536956756bc16d7e54e

7 years agoReplace DWORD with uint32_t
Jakub Pawlowski [Thu, 3 Nov 2016 21:18:55 +0000 (14:18 -0700)]
Replace DWORD with uint32_t

Test: mma -j45
Change-Id: Ia96e87460a22c9c14ba682d07dfcb3bf5479add8

7 years agoUse rc_handle for reconciliation of timer callback
Sanket Agarwal [Wed, 2 Nov 2016 22:01:32 +0000 (15:01 -0700)]
Use rc_handle for reconciliation of timer callback

Since the timer callback requires copy of the passed argument, it is not
a good idea to pass non-constant data. Instead passing handle since
lookup based on the handle is safe against possible corruption.

Bug: b/32610667
Change-Id: I02270b0f52d79310e2db8cf218f624eeb674b9c8

7 years agoCheck A2DP source is not already shut{ting} down
Sanket Agarwal [Wed, 2 Nov 2016 18:56:44 +0000 (11:56 -0700)]
Check A2DP source is not already shut{ting} down

In case A2DP is not enabled we are still executing the shut down path
which is leading to a race condition and posting to a thread queue which
is never created.

Bug: b/32610895
Change-Id: Id0cf95f4c7b5be26be28db5e837fbca3a0a87072

7 years agoA2DP codec related fixes and cleanup
Pavlin Radoslavov [Tue, 25 Oct 2016 17:17:56 +0000 (10:17 -0700)]
A2DP codec related fixes and cleanup

* Update bta_av_co_audio_getconfig() to select the preferred codec
* Fix a bug in selecting the A2DP codec inside
  bta_av_co_audio_set_codec()
* No need for function A2DP_ParsSbcMplHdr() to be exposed in the API
* Generalize the following APIs, so they can be used to redirect
  the call for vendor-specific codecs:
  - A2DP_CodecSepIndexStr()
  - A2DP_InitCodecConfig()
  - A2DP_SetSourceCodec()
* Change tA2DP_ENCODER_INIT_PARAMS.SamplingFreq from uint16_t to
  uint32_t so it can store larger sampling frequency.
* Rename content protection constants from BTA_AV_CP_*
  to AVDT_CP_* and move them from bta_av_co.h to avdt_api.h
* Rename some of the internal functions in a2dp_sbc.cc
* Add extra debug logging and fix some comments

Test: A2DP streaming, unit tests passing
Change-Id: I1b67ff18dc568dd859429fcd89c644799fb1438d

7 years agoMerge "Remove unused BLE_PERIPHERAL_MODE_SUPPORT"
Jakub Pawlowski [Wed, 2 Nov 2016 03:21:38 +0000 (03:21 +0000)]
Merge "Remove unused BLE_PERIPHERAL_MODE_SUPPORT"

7 years agoAG: CLCC response can contain non-ATD characters
Satish Kodishala [Wed, 22 Jun 2016 08:52:41 +0000 (14:22 +0530)]
AG: CLCC response can contain non-ATD characters

Test case:
1. Connect Plantronics backbeat PRO headset.
2. Initiate outgoing call from phone.
3. Accept the call from remote side and terminate call.
4. Try to redial from headset and observe

Failure:
AG is sending error for redial request from BT headset.

Root cause:
Sometimes, the number in CLCC response has "-".
Repeated from the headset, the ATD string has "-"
which is not allowed in the dial string for ATD and
errors.

Fix:
 * Sanitize CLCC response to only include valid ATD characters.
 * Accept "-" in ATD because it works for us.

Change-Id: I854165c7da295f428852c829543eb4fc18455d91

7 years agoRemove unused BLE_PERIPHERAL_MODE_SUPPORT
Jakub Pawlowski [Tue, 1 Nov 2016 20:43:03 +0000 (13:43 -0700)]
Remove unused BLE_PERIPHERAL_MODE_SUPPORT

This patch removes BLE_PERIPHERAL_MODE_SUPPORT and all code related to
it, which is unused.

Bug: 30622771
Bug: 24099160
Change-Id: Ic9cc2a94c8d1b974814d453ee8a0073e7d6deb85

7 years agoMerge "Move start advertise method to advertising interface (3/3)"
Jakub Pawlowski [Tue, 1 Nov 2016 22:30:42 +0000 (22:30 +0000)]
Merge "Move start advertise method to advertising interface (3/3)"

7 years agoMerge "Assign pairing code to bta_dm_cb before device name resolution"
Treehugger Robot [Tue, 1 Nov 2016 21:40:44 +0000 (21:40 +0000)]
Merge "Assign pairing code to bta_dm_cb before device name resolution"

7 years agoMove start advertise method to advertising interface (3/3)
Jakub Pawlowski [Mon, 31 Oct 2016 18:15:20 +0000 (11:15 -0700)]
Move start advertise method to advertising interface (3/3)

Advertising related code should be exposed through
BleAdvertiserInterface. Move client.listen function into this interface.
Remove reduntant clientif parameter.

Bug: 30622771
Bug: 24099160
Test: no tests necessary
Change-Id: Icc865c062e3d7c4b83bbeea6ff5b08bd2c1c4d9a

7 years agoMerge "Simplify BTA_GATTC_Listen"
Treehugger Robot [Tue, 1 Nov 2016 20:53:13 +0000 (20:53 +0000)]
Merge "Simplify BTA_GATTC_Listen"

7 years agoAssign pairing code to bta_dm_cb before device name resolution
Jack He [Tue, 1 Nov 2016 18:30:51 +0000 (11:30 -0700)]
Assign pairing code to bta_dm_cb before device name resolution

Device name resolution, BTM_ReadRemoteDeviceName(), will cause
bta_dm_sp_cback() to exit early and bta_dm_pinname_cback() callback
will be invoked after the resolution, which continues the pairing
with pairing code from bta_dm_cb.num_val. Hence, bta_dm_cb.num_val
needs to be assigned before BTM_ReadRemoteDeviceName() is called.

Test: manual
Bug: 31381715
Change-Id: I61f06a9d878dd72154d6621eb094dcea5f701cbc

7 years agoAVRCP CT: Add get_play_status_cmd API
Sanket Agarwal [Thu, 22 Sep 2016 21:11:09 +0000 (14:11 -0700)]
AVRCP CT: Add get_play_status_cmd API

- Required for PTS test case TC_CT_MDI_BV_01_C

Bug: b/31684931
Change-Id: Ice0bd36e3282d1c543c8c7bbec63f406311c0f6b
(cherry picked from commit 9a55fbe77cd9c6acb56e2e24cccfb9f34a89c729)

7 years agoSimplify BTA_GATTC_Listen
Jakub Pawlowski [Mon, 31 Oct 2016 16:50:20 +0000 (09:50 -0700)]
Simplify BTA_GATTC_Listen

It is necessary to make BTA_GATTC_Listen not dependent on client_if
before it is moved to advertising interface, where it belongs.

Bug: 30622771
Bug: 24099160
Test: no tests necessary
Change-Id: I75dc7e0fcd64fd3437474933069941b52740f0b5

7 years agoMerge "Make bta_gattc_listen only start listening"
Treehugger Robot [Tue, 1 Nov 2016 19:04:07 +0000 (19:04 +0000)]
Merge "Make bta_gattc_listen only start listening"

7 years agoMake bta_gattc_listen only start listening
Jakub Pawlowski [Fri, 28 Oct 2016 23:44:49 +0000 (16:44 -0700)]
Make bta_gattc_listen only start listening

The bta_gattc_listen method is used only to start advertising on devices
not using Vendor-Specific Callbacks. It should not notify the client
calling it of all connected devices.

It is also unnecessary to add the gatt client as listening for background
connections. No such thing is done for multi advertising.

Bug: 30622771
Bug: 24099160
Test: code is still compiling
Change-Id: Ia11a247b8416f77543087cd3f18331fcfe7bd207

7 years agoImplement AVRCP SetAddressedPlayer Cmd
Sanket Agarwal [Fri, 16 Sep 2016 22:41:18 +0000 (15:41 -0700)]
Implement AVRCP SetAddressedPlayer Cmd

Bug: b/31554234
Change-Id: I700bc1dc65f9c8c7d1e5e57c568487a53ae9fbf7
(cherry picked from commit 53ffd333c7e6db731a8db2e742dcd29d4416270c)

7 years agoConvert one remaining use of full protobuf runtime
Colin Cross [Thu, 27 Oct 2016 20:37:40 +0000 (13:37 -0700)]
Convert one remaining use of full protobuf runtime

I missed one use of the full protobuf runtime, replace it with
libprotobuf-cpp-lite.

Test: builds
Bug: 32417805
Change-Id: Idc5d458dbd5844801e5a2cc6df69720d4e839c55

7 years agoMerge "Fix AdvertiseDataParsing test"
Treehugger Robot [Tue, 1 Nov 2016 01:43:29 +0000 (01:43 +0000)]
Merge "Fix AdvertiseDataParsing test"

7 years ago[AVRCP1.6 CT] Add reply status to get_folder_items_callback.
Sanket Agarwal [Mon, 29 Aug 2016 17:28:03 +0000 (10:28 -0700)]
[AVRCP1.6 CT] Add reply status to get_folder_items_callback.

It is useful to know what error code the get_folder_items_cmd gets back
with since it can help the UI decide if to keep fetching more. For ex.
if the return code is out of range then the UI does not need to keep
fetching anymore. This is useful for folders where we do not know the
size before hand (Media Player List or Now Playing List).

Bug: b/31253501

Change-Id: I0f43167d00bcf2e1e320be086fd9cacd163906a1
(cherry picked from commit e3a032a89ac2f20e96808fe2bded2c42fa3afb14)

7 years agoAVRCP_CTRL: Broadcast 1.6 with browsing support
AnubhavGupta [Wed, 24 Aug 2016 09:06:23 +0000 (14:36 +0530)]
AVRCP_CTRL: Broadcast 1.6 with browsing support

 - enable browsing bit for SDP record and bump the profile version

Bug: b/28791287

Change-Id: I0572b84d36a52c5f027196022f342057c607b93b

7 years agoMerge "hci: Fix multi-line comments after clang-format"
Treehugger Robot [Mon, 31 Oct 2016 23:02:56 +0000 (23:02 +0000)]
Merge "hci: Fix multi-line comments after clang-format"

7 years agoMerge "test: Add a README file"
Treehugger Robot [Mon, 31 Oct 2016 21:10:40 +0000 (21:10 +0000)]
Merge "test: Add a README file"

7 years agohci: Fix multi-line comments after clang-format
Myles Watson [Mon, 31 Oct 2016 20:50:51 +0000 (13:50 -0700)]
hci: Fix multi-line comments after clang-format

Test: mma -j32
Change-Id: I041856c2a9f17948650387dd9c952365bcca033d

7 years agohci: Apply clang-format
Myles Watson [Mon, 31 Oct 2016 17:53:52 +0000 (10:53 -0700)]
hci: Apply clang-format

Remove double asterisks:
  cd hci/
  find . | grep "\.cc\|\.h\|\.c" | \
     xargs -I REPLACE sed 's/^[*][*]/ \*/' -i REPLACE

Run clang-format:
  find . | grep "\.cc\|\.h\|\.c" | xargs -I REPLACE \
     clang-format --style=file -i REPLACE

Test: mma -j32
Change-Id: Ie74244127c8a264dd087d199155274d4655ccf65

7 years agoFix AdvertiseDataParsing test
root [Mon, 31 Oct 2016 20:37:33 +0000 (13:37 -0700)]
Fix AdvertiseDataParsing test

Test: run LowEnergyAdvertiserPostRegisterTest.AdvertiseDataParsing
Change-Id: Ib9f4dbc1079ae289cc5eeaee9ca7050d308a4ab0

7 years agobt address memory copy error in btif_av_state_opening_handler()
Ting Zheng [Tue, 19 Jul 2016 22:29:19 +0000 (15:29 -0700)]
bt address memory copy error in btif_av_state_opening_handler()

[Problem]
In btif_av_state_opening_handler() BTIF_AV_CONNECT_REQ_EVT
handling, it reported the wrong bt address. It happened when remote speaker
connected back and local also tried to initiate the connection almost at the
same time, so that A2dpStateMachine recognized mTargetDevice and mIncomingDevice
as two different deivices. When it was final connected, A2dpStateMachine ignored
the connected event as "ERROR: current, target, or mIncomingDevice not null in
Disconnected".

[Solution]
Modify (bt_bdaddr_t*)p_data to ((btif_av_connect_req_t *)p_data)->target_bda in
btif_av_state_opening_handler() BTIF_AV_CONNECT_REQ_EVT handling. In previous
design, it would copy the address of target_bda and uuid in
btif_av_connect_req_t rather than the real address pointed by target_bda.

Change-Id: Icbc5150016d6f75aa314b5d9e152a2de74f0cfbe
Signed-off-by: Ting Zheng <ting.zheng@mediatek.com>
7 years agoRemove position dependent lookup tables in AT command parser
Andre Eisenbach [Sat, 23 Jul 2016 06:15:11 +0000 (23:15 -0700)]
Remove position dependent lookup tables in AT command parser

The various position dependent lookup tables in the AT command parser
were out of sync, causing invalid responses to the AT+CBPS command for
example.

This patch gets rid of positionally dependent enums for simple lookup
tables that correlate all the values for easier, less error prone
maintenance of the related tables.

This re-instates a previously reverted patch after fixing incorrect
field order in tBTA_AG_INDICATOR_MAP.

Change-Id: I7f8a052e78706c8c72c5102b38cfe9ce200ae0d9
Fixes: 29978908
(cherry picked from commit b5cc24fcdaeb32f1f44bc39b65f6b0c035e47d5f)

7 years agoMerge "Remove advertise whitelist functionality"
Jakub Pawlowski [Sat, 29 Oct 2016 00:29:49 +0000 (00:29 +0000)]
Merge "Remove advertise whitelist functionality"

7 years agoMerge "Exclude calls to android-specific code in generic build"
Jakub Pawlowski [Fri, 28 Oct 2016 23:08:54 +0000 (23:08 +0000)]
Merge "Exclude calls to android-specific code in generic build"

7 years agoRemove advertise whitelist functionality
Jakub Pawlowski [Fri, 28 Oct 2016 22:23:08 +0000 (15:23 -0700)]
Remove advertise whitelist functionality

Advertise filtering is never used. It is not finished - adding device to
whitelist can never succed. It is also making advertising API unification
hard.

Bug: 30622771
Test: no tests necessary
Change-Id: I9df9ea18b265a580c2fcdb28a6d6ce4be43f0a24

7 years agoMerge "Enable AVRCP TG feature only when we can handle those commands"
Treehugger Robot [Fri, 28 Oct 2016 21:24:46 +0000 (21:24 +0000)]
Merge "Enable AVRCP TG feature only when we can handle those commands"

7 years agoMerge "Report FW configuration status to upper layer"
Treehugger Robot [Fri, 28 Oct 2016 20:50:42 +0000 (20:50 +0000)]
Merge "Report FW configuration  status to upper layer"

7 years agoMerge "Separate LE scanner and GATT client BTIF interfaces (3/3)"
Treehugger Robot [Fri, 28 Oct 2016 20:45:08 +0000 (20:45 +0000)]
Merge "Separate LE scanner and GATT client BTIF interfaces (3/3)"

7 years agoMerge "Separated initialize and re-initialize of DM control block"
Treehugger Robot [Fri, 28 Oct 2016 19:14:38 +0000 (19:14 +0000)]
Merge "Separated initialize and re-initialize of DM control block"

7 years agoReport FW configuration status to upper layer
Lakshmipathi K [Mon, 18 Jul 2016 09:26:10 +0000 (14:56 +0530)]
Report FW configuration  status to upper layer

Report Firware configuration if success or failure from vendor library
to the upper layers to take necessary actions to proceed with Stack
initialization or not.

Test: mm -j 8
Change-Id: I56e4749b0eb995eb484a6f56a8e1c684678a02f4
Signed-off-by: Lakshmipathi K <lakshmipathi.k@intel.com>
7 years agoEnable AVRCP TG feature only when we can handle those commands
Anubhav Gupta [Tue, 5 May 2015 12:18:24 +0000 (17:48 +0530)]
Enable AVRCP TG feature only when we can handle those commands

  - Disable Control, Meta and Browse commands when TG is not up.

Change-Id: Ib54c104e87c735b55d6c6ec07c08d2149acc1a6d

7 years agoSeparate LE scanner and GATT client BTIF interfaces (3/3)
Jakub Pawlowski [Thu, 27 Oct 2016 18:49:40 +0000 (11:49 -0700)]
Separate LE scanner and GATT client BTIF interfaces (3/3)

In order to properly separate low level structures associated with LE
scanner and GATT client, their interfaces must be separated first.

Test: sl4a BleScanApiTest
Bug: 30622771
Change-Id: If804632c8e4b08fd15d5b847c7838822cf98d79f

7 years agoImprove HOGP input report error handling
Lawrance Liu [Tue, 4 Oct 2016 08:09:15 +0000 (16:09 +0800)]
Improve HOGP input report error handling

This fixes com.android.bluetooth crash when receiving HOGP input report
for unknown characteristic.

Test: Pair/Unpair BLE mouse/keyboard devices.

7 years agoSeparated initialize and re-initialize of DM control block
Srinu Jella [Wed, 8 Jun 2016 12:01:41 +0000 (17:31 +0530)]
Separated initialize and re-initialize of DM control block

Use Case: Turning ON Bluetooth failed after network reset

Steps:
1. Turn ON Bluetooth
2. Go to settings->backup and restore->network reset.
3. Do reset to reset BT, WIFI, data.
4. Go back to Bluetooth settings menu and try to turn ON Bluetooth.

Failure: Bluetooth is not turning ON after network reset

Root Cause: In case BTA_SYS_HW_OFF_EVT event, alarm_new is getting called.
Which is causing issue in Next Turn ON of Bluetooth if PID is same.

Fix: Separated initialize and re-initialize of DM control block

Test: code compilation.

Change-Id: I09abfb22c67f04626564a7791e4b61ec3a523cc1

7 years agotest: Add a README file
Myles Watson [Fri, 28 Oct 2016 00:20:02 +0000 (17:20 -0700)]
test: Add a README file

Test: Open README.md in a markdown viewer

Change-Id: I54342dee00bdffa4195bb9c160b12ff950e6c77b

7 years agoSeparate LE scanner from GATT client (4/4)
Jakub Pawlowski [Wed, 26 Oct 2016 22:31:24 +0000 (15:31 -0700)]
Separate LE scanner from GATT client (4/4)

Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Bug: 30622771
Change-Id: I23b71255c459b185257654f68ea251b41ed2a14b

7 years agoRemove deprecated UNUSED macro (5/5)
Myles Watson [Thu, 27 Oct 2016 17:27:36 +0000 (10:27 -0700)]
Remove deprecated UNUSED macro (5/5)

Include osi.h for UNUSED_ATTR.

Test: mma -j32

Change-Id: I43260669dc1f54639e46cc9620093d727ee86276

7 years agoRemove deprecated UNUSED macro (4/5)
Myles Watson [Thu, 27 Oct 2016 17:03:08 +0000 (10:03 -0700)]
Remove deprecated UNUSED macro (4/5)

These variables are the unused results of parsing macros.

Test: mma -j32

Change-Id: Id377b8280d8fb7cf1e4a366d8ac10bdb5a09361c

7 years agoRemove deprecated UNUSED macro (3/5)
Myles Watson [Thu, 27 Oct 2016 17:02:37 +0000 (10:02 -0700)]
Remove deprecated UNUSED macro (3/5)

These were caused by ifdefs, so they had to be
done by hand.

TEST: mma -j32

Change-Id: I183f3ee82e8744fed2b65dc96dc492b5bf079243

7 years agoRemove deprecated UNUSED macro (2/5)
Myles Watson [Thu, 27 Oct 2016 17:01:49 +0000 (10:01 -0700)]
Remove deprecated UNUSED macro (2/5)

These had to be added by hand.

Test: mma -j32

Change-Id: I0ea126a404fbaa27f2137bc197ee0f48cf87ac28

7 years agoRemove deprecated UNUSED macro (1/5)
Myles Watson [Thu, 27 Oct 2016 15:52:16 +0000 (08:52 -0700)]
Remove deprecated UNUSED macro (1/5)

Generated automatically with coccinelle

/* This rule matches functions with arguments
 * that have an UNUSED(arg) in the body.
 */
@r1@
identifier arg;
identifier fn;
type t;
parameter list[n] P;
@@

fn(P, const t arg) { ...
 UNUSED(arg);
 ...
 }

/* This rule removes the UNUSED line, and adds
 * UNUSED_ATTR to the parameter list.
 */
@depends on r1@
identifier r1.arg;
identifier r1.fn;
type r1.t;
parameter list[r1.n] r1.P;
typedef UNUSED_ATTR;
@@

fn(P,
- const t arg
+ UNUSED_ATTR GETRIDOFTHISCOMMA, const t arg
 ) { ...
-UNUSED(arg);
 ...
 }

Test: mma -j32

Change-Id: Idcaadd688d669d484e557becd050e69454508f3c

7 years agoReplace bluetooth protos with protobuf-lite
Colin Cross [Wed, 26 Oct 2016 21:25:28 +0000 (14:25 -0700)]
Replace bluetooth protos with protobuf-lite

Use lite protobufs for bluetooth to remove dependency on
libprotobuf-cpp-full, which will be removed from the platform.

Requires dropping support for
adb shell dumpsys bluetooth_manager --proto-text
which requires full protobufs to call TextToString.  The functionality
can be restored without adding a dependency on full protobufs with a
host protobuf decoder.

Bug: 32417805
Test: builds
Change-Id: Ifc9ee23264b1bfff3ad1f85ef4914f788028971a

7 years agoExclude calls to android-specific code in generic build
Jakub Pawlowski [Tue, 25 Oct 2016 21:05:21 +0000 (14:05 -0700)]
Exclude calls to android-specific code in generic build

Currently there is no AVRCP implementation for non-android.

Test: build with ninja
Change-Id: I2ed1506923d4dc245a13168e881ed685b3385d19