OSDN Git Service

android-x86/system-bt.git
8 years agoRevert "Keep sec_dev_rec in list instead of static array"
Andre Eisenbach [Wed, 3 Feb 2016 18:30:28 +0000 (10:30 -0800)]
Revert "Keep sec_dev_rec in list instead of static array"

Breaks pairing...

This reverts commit c9f86da73bfb637426c83b86497c50fede4e0f63.

8 years agoMake autoconnect work properly for devices not having security record
Jakub Pawlowski [Wed, 3 Feb 2016 01:11:45 +0000 (17:11 -0800)]
Make autoconnect work properly for devices not having security record

Change-Id: I16f71da85afe780383a5d84a904b44aabe4af9f7

8 years agoKeep sec_dev_rec in list instead of static array
Jakub Pawlowski [Mon, 1 Feb 2016 19:53:36 +0000 (11:53 -0800)]
Keep sec_dev_rec in list instead of static array

This reduces the computational complexity of most BLE operations.

Change-Id: I3997b414680ff4288091b1ddf00ec1ef1c4453fb

8 years agoFixed paired device config UUID parsing logic
Andre Eisenbach [Sat, 30 Jan 2016 00:11:13 +0000 (16:11 -0800)]
Fixed paired device config UUID parsing logic

Also added unit tests to cover this bug.

Bug: 26883553
Change-Id: Ice8641fad5c38ee43f1b080665dde70979f9d60f

8 years agoMake list_foreach() even more useful
Jakub Pawlowski [Mon, 1 Feb 2016 19:51:44 +0000 (11:51 -0800)]
Make list_foreach() even more useful

- Changed |callback| return type to list_node_t to be able to interrupt
  iteration (to find specific elements for example).

Change-Id: I00eb83725d03e6f1aec239ae11eb19cf59af35a9

8 years agoAssume input from /dev/stdin if no argument provided to btsnooz.py.
Sharvil Nanavati [Sat, 23 Jan 2016 01:03:03 +0000 (17:03 -0800)]
Assume input from /dev/stdin if no argument provided to btsnooz.py.

Change-Id: I54bd137e67eb1fc959663189bcdaac4690c2c645

8 years agoRemove unused method
Jakub Pawlowski [Sat, 30 Jan 2016 08:53:30 +0000 (00:53 -0800)]
Remove unused method

Change-Id: Icb1a9f76cade28112c084cf6fde4d0f8d9c57ed0

8 years agoAdded extra Werror compiler flags
Pavlin Radoslavov [Fri, 29 Jan 2016 21:37:44 +0000 (13:37 -0800)]
Added extra Werror compiler flags

Added extra Werror compiler flags that are globally enabled
by default only on certain targets (e.g., arm64).
Thus, we can catch build errors before submitting the code.

Bug: 26879229
Change-Id: I8b1dae6f61219d2274cd2df019464315d4172da2

8 years agoservice/client: command line made nicer
Jakub Pawlowski [Fri, 29 Jan 2016 07:57:17 +0000 (23:57 -0800)]
service/client: command line made nicer

Currently we print many unnecessary newlines and redisplay prompt too
often. This patch makes the bluetooth-cli output look much nicer.

Change-Id: I5b9d4844488d188e086f12d94e11c4b3e8bf1ddb

8 years agoUse C99 for new btif static library
Andre Eisenbach [Fri, 29 Jan 2016 22:24:53 +0000 (14:24 -0800)]
Use C99 for new btif static library

Change-Id: Ica13d4e61f22e9bccfa5e3a5104c057cc7693233

8 years agoFix build error in bta_gattc_cache.c
Andre Eisenbach [Fri, 29 Jan 2016 21:52:20 +0000 (13:52 -0800)]
Fix build error in bta_gattc_cache.c

Change-Id: I41e95f880bd37647278ad9dba4e12c2b54db273b

8 years agoMerge "Make BTIF a static library; add unit test framework"
Andre Eisenbach [Fri, 29 Jan 2016 21:35:38 +0000 (21:35 +0000)]
Merge "Make BTIF a static library; add unit test framework"

8 years agoMake BTIF a static library; add unit test framework
Andre Eisenbach [Fri, 22 Jan 2016 01:47:46 +0000 (17:47 -0800)]
Make BTIF a static library; add unit test framework

Moving BTIF to a static library allows it to be loaded for unit tests.
The framework has been put in place to add unit tests to
'net_test_btif'.

Change-Id: Ie7e0984e90f11f6e3df5c0f34c77cc976627f1d2

8 years agoservice: add get_gatt_db and it's callback to HAL
Jakub Pawlowski [Fri, 22 Jan 2016 08:09:10 +0000 (00:09 -0800)]
service: add get_gatt_db and it's callback to HAL

Change-Id: I6412b464c4299ea351446f384b539ffa2e6111b2

8 years agoAdd new HAL method get_gatt_db
Jakub Pawlowski [Fri, 22 Jan 2016 07:26:11 +0000 (23:26 -0800)]
Add new HAL method get_gatt_db

Currently getting GATT database from HAL requires multiple calls
and iterating over each element. This is long, unnecessary
complicated process, error prone process. This patch adds new
method, get_gatt_db that can be used to grab whole GATT database
for remote device just in one call.

Change-Id: Ib5d88fbc28d09d5c191e7c0152ca61d6a34f7a81

8 years agoRevert "Revert "Avoid double memory free and crash during LE discovery or disconnect""
Pavlin Radoslavov [Fri, 29 Jan 2016 06:46:31 +0000 (22:46 -0800)]
Revert "Revert "Avoid double memory free and crash during LE discovery or disconnect""

The revert includes a compilation fix as well
(missing include of a header file).

This reverts commit 3a4082d7af5c5941769c700d774022a9b982d45c.

Change-Id: I5bb1f468d2c64839037afe5ed2d3ed5d1b21dca2

8 years agoRevert "Avoid double memory free and crash during LE discovery or disconnect"
Ian Pedowitz [Fri, 29 Jan 2016 04:36:30 +0000 (04:36 +0000)]
Revert "Avoid double memory free and crash during LE discovery or disconnect"

This reverts commit 12091a323ef84cad10d91fcf6588a6657e591ee0.

Change-Id: I01deaa5024bfef1782887fd8f8137f83916d8be0

8 years agoAvoid double memory free and crash during LE discovery or disconnect
Nitin Arora [Thu, 28 Jan 2016 01:02:02 +0000 (17:02 -0800)]
Avoid double memory free and crash during LE discovery or disconnect

1. Prevent GATT operations to proceed if queue is not empty

This change returns a FALSE from GATT enqueue operation, in case
there is already a GATT command enqueued. This simple change will
a. Prevent incorrect memory freeing of the currently queued command.
b. Prevent incorrect dequeing of the ongoing command and enqueing
another command which will never be executed.
c. Double free of memory causing segmentation fault

2. Prevent performing pending operations when link is down

This change prevents performing the execution of pending operations
when the link is disconnected. The pending operation in that case
is bound to fail thus freeing the memory pointed to by the p_q_cmd
which is cleaned up again by the discovery completion routine and
thus causing double free.

Bug:24178843
Change-Id: Ief2756f289a7db73d251ef7e247774dd3f7fc413

8 years agoAdd missing include statements
Pavlin Radoslavov [Thu, 28 Jan 2016 19:37:43 +0000 (11:37 -0800)]
Add missing include statements

This fixes "implicit declaration of function ..." warnings/errors.

Change-Id: I07d0f6a60fdb34acef6a11a00f6e528adece150f

8 years agoAdded metrics for A2DP transmission queue
Pavlin Radoslavov [Thu, 14 Jan 2016 00:27:01 +0000 (16:27 -0800)]
Added metrics for A2DP transmission queue

Collect and display A2DP metrics related to the A2DP transmission queue.
The result can be displayed by "adb shell dumpsys bluetooth_manager":

A2DP State:

  TxQueue:
    Counts (enqueue/dequeue/readbuf)                        : 1767 / 1767 / 3504
    Last update time ago in ms (enqueue/dequeue/readbuf)    : 3 / 3 / 3
    Frames per packet (total/max/ave)                       : 12210 / 11 / 6
    Counts (flushed/dropped/dropouts)                       : 0 / 0 / 0
    Last update time ago in ms (flushed/dropped)            : 0 / 0
    Counts (underflow/underrun)                             : 0 / 0
    Bytes (underflow/underrun)                              : 0 / 0
    Last update time ago in ms (underflow/underrun)         : 0 / 0
    Enqueue deviation counts (overdue/premature)            : 893 / 871
    Enqueue overdue scheduling time in ms (total/max/ave)   : 242 / 12 / 0
    Enqueue premature scheduling time in ms (total/max/ave) : 842 / 20 / 0
    Dequeue deviation counts (overdue/premature)            : 869 / 897
    Dequeue overdue scheduling time in ms (total/max/ave)   : 604 / 11 / 0
    Dequeue premature scheduling time in ms (total/max/ave) : 1204 / 19 / 1

Change-Id: I75c8f24a26cf9ce7a4164a142d4ac286ff17f322

8 years agoFix the calling pattern of the debug dump functions
Pavlin Radoslavov [Thu, 28 Jan 2016 16:45:46 +0000 (08:45 -0800)]
Fix the calling pattern of the debug dump functions

Group together the calls to the internal foo_dump() functions,
so the output file descriptor is not closed prematurely.

Bug: 26847370
Change-Id: I3afc9502169424081efcc5deae055fbbd91ed5f1

8 years agoMerge "Spoof response to AT+CNUM if we don't get a reply from the audio gateway."
Sharvil Nanavati [Thu, 28 Jan 2016 15:48:34 +0000 (15:48 +0000)]
Merge "Spoof response to AT+CNUM if we don't get a reply from the audio gateway."

8 years agoFix return value for HAL function config_clear.
Sharvil Nanavati [Tue, 26 Jan 2016 21:09:22 +0000 (13:09 -0800)]
Fix return value for HAL function config_clear.

Change-Id: I75712f721f7031705d0accb4ffe89467d52d7aa3

8 years agoAdds null check before freeing LE services list
Subramanian Srinivasan [Fri, 15 Jan 2016 01:45:01 +0000 (17:45 -0800)]
Adds null check before freeing LE services list

Prevents the crash which happens when device is
disconnected during service discovery and the
services list is not yet properly allocated
memory and populated. This change frees up the
services list after discovery complete only when
it is not null.

Change-Id: I0ced14d2ee133a332fa2fd7c456267438813a600

8 years agoFix compilation errors when SMP_DEBUG flag is enabled
Subramanian Srinivasan [Sat, 9 Jan 2016 01:37:28 +0000 (17:37 -0800)]
Fix compilation errors when SMP_DEBUG flag is enabled

Fix compilation errors in SMP related files when
SMP_DEBUG compile time flag is enabled.

Change-Id: I5593750c27241345beb8e8b9278b045803d3fcc9

8 years agoSpoof response to AT+CNUM if we don't get a reply from the audio gateway.
Sharvil Nanavati [Wed, 27 Jan 2016 17:43:16 +0000 (09:43 -0800)]
Spoof response to AT+CNUM if we don't get a reply from the audio gateway.

The Huawei Honor 4X CHE1-CL10 phone doesn't reply to AT+CNUM so
we end up disconnecting the service level connection. In this CL,
I'm spoofing an OK response to AT+CNUM in case we time out waiting
for a reply.

Bug: 26504036
Change-Id: I91d5ab4ea91fd67b3f6c6f796c39fd0091bff5cf

8 years agoAllow alarm_cancel() on NULL timers
Pavlin Radoslavov [Thu, 28 Jan 2016 00:03:19 +0000 (16:03 -0800)]
Allow alarm_cancel() on NULL timers

Remove an assert that prevents using alarm_cancel() with NULL
timers.

Bug: 26831803
Change-Id: Ifd1476272b13a3f7fd5a0dbb57ee867cbfe2c2bb

8 years agoservice: Update HAL call for arguments
Marie Janssen [Tue, 12 Jan 2016 19:14:24 +0000 (11:14 -0800)]
service: Update HAL call for arguments

The HAL now takes an additional argument for dumpsys arguments.

Change-Id: I286149e4d86ea50c4830a9f6d32e1d57025d01a7

8 years agoservice: MTU changed callback for GATT server
Jakub Pawlowski [Wed, 27 Jan 2016 19:38:54 +0000 (11:38 -0800)]
service: MTU changed callback for GATT server

Change-Id: I8431e970004f9b96cc40c3a5ca7878815d4d53bb

8 years agoservice/client: add command to change MTU
Jakub Pawlowski [Tue, 26 Jan 2016 22:56:21 +0000 (14:56 -0800)]
service/client: add command to change MTU

Change-Id: I096760759991b855efd897adbd6c5aa4e18b26bb

8 years agoAdd explicit sec_act parameter to encryption requests
Andre Eisenbach [Tue, 26 Jan 2016 21:29:11 +0000 (13:29 -0800)]
Add explicit sec_act parameter to encryption requests

This avoids de-referencing a potentially NULL pointer (p_ref_data) and
also makes the use of the parameter more obvious.

Also added NULL check before invoking security callback.

Bug: 26792899
Change-Id: I6613c9c2706f1d460ab39421a967d79c59ad0fde

8 years agoFix invalid pointer de-reference resulting in a crash
Andre Eisenbach [Tue, 26 Jan 2016 19:19:16 +0000 (11:19 -0800)]
Fix invalid pointer de-reference resulting in a crash

Bug: 26792899
Change-Id: I0c9a22ef1574e6214c108a4b247cf24e26f71ee9

8 years agoservice: add SetMtu and OnMtuChanged
Jakub Pawlowski [Tue, 26 Jan 2016 20:58:47 +0000 (12:58 -0800)]
service: add SetMtu and OnMtuChanged

Change-Id: I7a6c6cb46f4710b5d2c57b9d0e9cfac166d7cd62

8 years agoMerge "Remove headers from LOCAL_SRC_FILES"
Dan Willemsen [Wed, 27 Jan 2016 00:34:20 +0000 (00:34 +0000)]
Merge "Remove headers from LOCAL_SRC_FILES"

8 years agoservice: add bunch of GATT callback handlers
Jakub Pawlowski [Tue, 26 Jan 2016 17:53:06 +0000 (09:53 -0800)]
service: add bunch of GATT callback handlers

RegisterForNotificationCallback
NotifyCallback
WriteCharacteristicCallback
WriteDescriptorCallback

Change-Id: Ic92104e427d153b5b6567fcd7fe4d967df2b3b61

8 years agoservice/example: Heart Rate Server: advertise UUID
Jakub Pawlowski [Tue, 26 Jan 2016 03:27:43 +0000 (19:27 -0800)]
service/example: Heart Rate Server: advertise UUID

Change-Id: Iaf7950e9af73926ec7bfb37189882ba8fad4123c

8 years agoMerge "service: add pairing callback handling"
Jakub Pawlowski [Tue, 26 Jan 2016 16:55:58 +0000 (16:55 +0000)]
Merge "service: add pairing callback handling"

8 years agoMerge "service: Fix BluetoothInterface locking issues"
Jakub Pawlowski [Tue, 26 Jan 2016 16:55:27 +0000 (16:55 +0000)]
Merge "service: Fix BluetoothInterface locking issues"

8 years agoservice: add pairing callback handling
Jakub Pawlowski [Tue, 26 Jan 2016 03:38:47 +0000 (19:38 -0800)]
service: add pairing callback handling

Change-Id: I13badc4ab9738374bfa082360a68086524d6bd9b

8 years agoservice: implement HAL callback for response confirmation
Jakub Pawlowski [Tue, 26 Jan 2016 15:12:46 +0000 (07:12 -0800)]
service: implement HAL callback for response confirmation

Change-Id: Iec1c33574cef49053cf1f8eb3835b20047cb96eb

8 years agoDo not enable A2DP sink by default
Andre Eisenbach [Mon, 25 Jan 2016 22:21:21 +0000 (14:21 -0800)]
Do not enable A2DP sink by default

Bug: 26742931
Change-Id: I70b1fdcd72abae2712e37f49ecb588901998cc12

8 years agoservice: Fix BluetoothInterface locking issues
Jakub Pawlowski [Tue, 26 Jan 2016 03:35:57 +0000 (19:35 -0800)]
service: Fix BluetoothInterface locking issues

ObserverList class handles adding/removing elements during iteration
by itself, therefore we don't need to do any locking.
Additionally, change lock type to shared for better performance, and
to avoid possible deadlocks that might be caused by calling HAL from
observers.

Change-Id: Ie2e6ff61f6a285e2f9d3dd1ab7ed37985ca31082

8 years agoRemove headers from LOCAL_SRC_FILES
Dan Willemsen [Tue, 26 Jan 2016 03:48:44 +0000 (19:48 -0800)]
Remove headers from LOCAL_SRC_FILES

The build system does not use headers or directories in LOCAL_SRC_FILES.
To prevent typos, it's becoming a warning to add something to
LOCAL_SRC_FILES that is not used.

Also remove default values while we're here.

Change-Id: Ide7b6ecbe21933719736342d4d545368788c652b

8 years agoservice: Handle configure_mtu_cb, search_complete_cb and search_result_cb events
Jakub Pawlowski [Fri, 22 Jan 2016 03:44:43 +0000 (19:44 -0800)]
service: Handle configure_mtu_cb, search_complete_cb and search_result_cb events

This patch adds HAL wrappers for those three events in preparation to
triggering MTU exchange and service discovery.

search_result_cb will not be propagated above HAL, new method will be
implemented to get GATT database content when it's ready.

Change-Id: Id25699879923ff64c8bdb8942581ea32c2390dac

8 years agoMerge "service/example: Add advertise flag for hr server"
Marie Janssen [Mon, 25 Jan 2016 16:18:55 +0000 (16:18 +0000)]
Merge "service/example: Add advertise flag for hr server"

8 years agoMerge "service: handle remote_device_properties_cb callback"
Jakub Pawlowski [Mon, 25 Jan 2016 14:54:50 +0000 (14:54 +0000)]
Merge "service: handle remote_device_properties_cb callback"

8 years agoAdditional headsets blacklisted for absolute volume
tturney [Thu, 21 Jan 2016 18:19:22 +0000 (10:19 -0800)]
Additional headsets blacklisted for absolute volume

Devices blacklisted:
Bluebuds Freedom
iKross
Jabra
Swage Rokitboost HS

Bug:26070064
Change-Id: Ic27d225718b84234541bf1b170f94dea0bc4463c

8 years agoMerge "Remove unused definition BOARD_HAVE_BLUETOOTH_BCM."
Sharvil Nanavati [Sat, 23 Jan 2016 01:23:35 +0000 (01:23 +0000)]
Merge "Remove unused definition BOARD_HAVE_BLUETOOTH_BCM."

8 years agoA2DP audio HAL: fix write error behavior
Eric Laurent [Thu, 14 Jan 2016 02:09:37 +0000 (18:09 -0800)]
A2DP audio HAL: fix write error behavior

Do not return -1 status in case of write error but
emulate normal timing and return the number of bytes written
as if no error had occured.

This is because audio flinger does not take any recovery
action in case of write error anyway but does not increment the
number of frames written to the HAL.
In case of persisting error, active audio tracks will not finish playback
and a wakelock will be held indefinitely.

Bug: 25488825
Change-Id: I4f00ba8d7a5c55f70520d448d894240c54685027

8 years agoRemove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Sharvil Nanavati [Sat, 23 Jan 2016 00:54:33 +0000 (16:54 -0800)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.

Change-Id: I4f47ffbec067ad1d7b4db0269cd5f7ee21ae7861

8 years agoservice/example: Add advertise flag for hr server
Jakub Pawlowski [Fri, 22 Jan 2016 23:07:07 +0000 (15:07 -0800)]
service/example: Add advertise flag for hr server

From now on if example hr server is run with --advertise flag,
it will start advertising connectable advertisements with name
and tx power.

Change-Id: I9bc9e5037022c7b61d9f466e32a0c2e30a58815b

8 years agoAdd missing creation of timer tSMP_CB.smp_rsp_timer_ent
Pavlin Radoslavov [Fri, 22 Jan 2016 21:13:45 +0000 (13:13 -0800)]
Add missing creation of timer tSMP_CB.smp_rsp_timer_ent

Add missing creation of timer tSMP_CB.smp_rsp_timer_ent so
the timer is not NULL.

Bug: 26611369
Change-Id: I2882d40090599b628ecee777b244376168806776

8 years agoAdd extra log if timer_create(CLOCK_BOOTTIME_ALARM) fails
Pavlin Radoslavov [Fri, 22 Jan 2016 18:44:40 +0000 (10:44 -0800)]
Add extra log if timer_create(CLOCK_BOOTTIME_ALARM) fails

Add explicit log messages if timer_create(CLOCK_BOOTTIME_ALARM)
fails. The most likely reason is the kernel doesn't have
the appropriate patches.

Bug: 25739638
Change-Id: Icbeaa965d729ba11dfb7cfbb6185b1655b3c6de4

8 years agoservice: handle remote_device_properties_cb callback
Jakub Pawlowski [Fri, 22 Jan 2016 03:14:05 +0000 (19:14 -0800)]
service: handle remote_device_properties_cb callback

remote_device_properties_cb is being triggered by HAL when
scanning for remote devices. Leaving it as null causes lots
of assert errors in log. This patch fixes that.

Change-Id: I4dae3a34adbe59d659608387504206cc06ec6530

8 years agoA workaround for kernels missing CLOCK_BOOTTIME_ALARM
Pavlin Radoslavov [Fri, 22 Jan 2016 02:04:36 +0000 (18:04 -0800)]
A workaround for kernels missing CLOCK_BOOTTIME_ALARM

If the kernel doesn't have support for CLOCK_BOOTTIME_ALARM,
then timer_create(CLOCK_BOOTTIME_ALARM) will fail.

Added #ifdef KERNEL_MISSING_CLOCK_BOOTTIME_ALARM guard to get around
the issue. Platforms that don't have CLOCK_BOOTTIME_ALARM should have
the following lines in the device's "bdroid_buildcfg.h" file:

 /* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */
 #define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE

Bug: 26611369
Change-Id: I455dbbc20f43b21a83998cd60cac8dea0a73080d

8 years agoMerge "service: Solve locking issues inside GATT interface"
Jakub Pawlowski [Fri, 22 Jan 2016 02:23:30 +0000 (02:23 +0000)]
Merge "service: Solve locking issues inside GATT interface"

8 years agoRefactor the Bluetooth timers
Pavlin Radoslavov [Sat, 5 Dec 2015 01:36:34 +0000 (17:36 -0800)]
Refactor the Bluetooth timers

* Updated the alarm API:
  - Existing API alarm_new() is modified to take an alarm name
    as an argument.
  - New API alarm_new_periodic() is used to create a periodic
    alarm.
  - Added new API alarm_is_scheduled() to test whether an alarm is
    scheduled.
  - Existing API alarm_set_periodic() is removed: a periodic
    alarm is created by alarm_new_periodic().
  - Added new API alarm_set_on_queue() to set an alarm whose
    callback is executed on a specific queue.
  - Added new API alarm_register_processing_queue() and
    alarm_unregister_processing_queue() to register/unregister
    a queue and the corresponding thread for alarm processing.
  - Added corresponding unit tests.

* Updated the alarm internals:
  - Added alarm_info_t for collecting alarm-related information
    and statistics.
  - Collect and store alarm-related statistics into alarm_info_t
    per alarm.
  - Include the alarm-related statistics and info into the native
    dumpsys output for Bluetooth.
  - Once an alarm expires, the alarm execution is scheduled for
    processing on another internal alarm-specific thread, not
    on the thread that is maintaining the alarms.
  - Implemented callback execution ordering guarantee among
    timers on the same thread with exactly same timeout values.

* Refactor some of the usage of alarm_set() and simplify the
  code by using alarm_set_on_queue() instead.

* Removed the non_repeating timers wrapper, and use directly
  the alarm mechanism / API.

* Refactored all timer_entry_t timers and replaced them with alarm_t
  timers:
  - Replaced the btu_start_timer() / btu_stop_timer() /
    btu_start_quick_timer() / btu_stop_quick_timer() /
    btu_oneshot_alarm() mechanism with alarm_set_on_queue() and
    alarm_cancel()
  - Removed the whole mechanism around the BTU_TTYPE_* timers.

* Fixed a bug when processing the GATT indication confirmation timer
  expiration (timer tGATT_TCB.conf_timer: b/26610829).

* Renamed and/or split misc. timeout functions, fields, and timers

* Renamed time-related constants and changed the values from seconds
  to milliseconds

* Replaced timer tAVDT_CCB.timer_entry with three mutually exclusive timers:
  idle_ccb_timer, ret_ccb_timer, rsp_ccb_timer
  The reason we are using three timers, is because in the original code
  function avdt_ccb_chk_timer() used the timer type in its logic: it
  would stop the timer only if the type is "idle".

* Removed btm_ble_timeout() and replaced it with multiple timeout
  callback functions (per timer)

* Fix the actual value of the global constant BT_1SEC_TIMEOUT and
  rename it to BT_1SEC_TIMEOUT_MS

* Removed btu_cb and associated timers and events, because they are
  never used.

* Removed unused timers, functions, struct and declarations that are
  not used / needed.

Bug: 26611369
Bug: 26610829

Change-Id: I812c8c31710a5daefc58b01fcf35c353768f390f

8 years agoAdd support for native kernel and callout wakelocks
Pavlin Radoslavov [Mon, 24 Aug 2015 23:29:21 +0000 (16:29 -0700)]
Add support for native kernel and callout wakelocks

 * Moved wakelock-related code to osi/src/wakelock.c
   The API is in osi/include/wakelock.h

 * Use wakelock_set_os_callouts() to specify native kernel
   or callout-based wakelock.
   On Android, wakelock_set_os_callouts() is called to
   set the bt_os_callouts_t callbacks into the Java layer.

 * Renamed alarm_set_wake_lock_paths() to wakelock_set_paths()

Also, added Bluetooth Wakelock Statistics to the bugreport.
Sample output:

$ adb shell dumpsys bluetooth_manager
...
Bluetooth Wakelock Statistics:
  Wakelock is acquired                    : false
  Wakelock acquired/released count        : 5 / 5
  Wakelock acquired/released errors       : 0 / 0
  Wakelock last acquired time (ms)        : 1524
  Wakelock acquired time min/max/avg (ms) : 1511 / 8104 / 3167
  Wakelock total acquired time (ms)       : 15836
  Bluetooth total run time (ms)           : 44123

Bug: 26645431
Change-Id: I42bfb7db5b016719faea39e47ebc77c3ad02467b

8 years agoMove btsnooz.py script from Android Wear to the BT stack project.
Sharvil Nanavati [Wed, 20 Jan 2016 17:14:47 +0000 (09:14 -0800)]
Move btsnooz.py script from Android Wear to the BT stack project.

Change-Id: I8368820b5ed9325d2c3b82885b9fe934c6bc87ca

8 years agoservice: Solve locking issues inside GATT interface
Jakub Pawlowski [Thu, 21 Jan 2016 00:24:03 +0000 (16:24 -0800)]
service: Solve locking issues inside GATT interface

ObserverList class handles adding/removing elements during iteration
by itself, therefore we don't need to do any locking.
Additionally, change lock type to shared for better performance, and
to avoid possible deadlocks that might be caused by calling HAL from
observers.

Change-Id: I4c372f1e03bd27a96bc6c036ab8ce34f5501c0a7

8 years agoUpdate btsnooz log file format to log ACL and SCO headers.
Sharvil Nanavati [Fri, 15 Jan 2016 21:41:56 +0000 (13:41 -0800)]
Update btsnooz log file format to log ACL and SCO headers.

Change-Id: I72db1769197150f34ebba6fcb9c0e3db2404f342

8 years agoFix build break in system/bt
Alex Vakulenko [Thu, 21 Jan 2016 03:04:32 +0000 (19:04 -0800)]
Fix build break in system/bt

This was due to libchrome uprev submitted earlier

Change-Id: Ic0f1bd80ff4563bd73754cd3b9fcd521e93616e7

8 years agoAdd socket tx/rx accounting
Adam Lesinski [Thu, 3 Dec 2015 06:15:08 +0000 (22:15 -0800)]
Add socket tx/rx accounting

Records network traffic going over bluetooth sockets. This patch adds support
for L2CAP and RFCOMM.

Bug: 26039657
Change-Id: Id30d69e4cd648f0e88ab23517e3b94f29b393995

8 years agoMerge "service/client: implement connect and disconnect methods"
Jakub Pawlowski [Thu, 21 Jan 2016 00:35:34 +0000 (00:35 +0000)]
Merge "service/client: implement connect and disconnect methods"

8 years agoservice/client: implement connect and disconnect methods
Jakub Pawlowski [Wed, 20 Jan 2016 01:07:53 +0000 (17:07 -0800)]
service/client: implement connect and disconnect methods

Change-Id: I141e8a1a917adfe7a2eb1c8adaf5e09fad9df5ac

8 years agoAdd missing field to fake Bluetooth interface
Ajay Panicker [Wed, 20 Jan 2016 22:42:20 +0000 (14:42 -0800)]
Add missing field to fake Bluetooth interface

Bug: 26686093
Change-Id: I09867ae073fb32165c64bf9d306b699c6bc843ee

8 years agobt: Update libchrome APIs to r369476
Alex Vakulenko [Wed, 20 Jan 2016 15:52:34 +0000 (07:52 -0800)]
bt: Update libchrome APIs to r369476

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

Change-Id: I988157d3a6e36ede6561c0fa6919bb756e8ed3dd

8 years agoservice: Expose Connect and Disconnect through IBluetothLowEnergy
Jakub Pawlowski [Wed, 20 Jan 2016 01:00:16 +0000 (17:00 -0800)]
service: Expose Connect and Disconnect through IBluetothLowEnergy

Change-Id: Idcfd3fac263e61bc1bb2be97017554d552511765

8 years agoMerge "Add Connect and Disconnect methods to LowEnergyClient"
Jakub Pawlowski [Wed, 20 Jan 2016 21:45:47 +0000 (21:45 +0000)]
Merge "Add Connect and Disconnect methods to LowEnergyClient"

8 years agoMerge "service: add HAL for connect/disconnect"
Jakub Pawlowski [Wed, 20 Jan 2016 21:45:40 +0000 (21:45 +0000)]
Merge "service: add HAL for connect/disconnect"

8 years agoAdd Connect and Disconnect methods to LowEnergyClient
Jakub Pawlowski [Wed, 20 Jan 2016 00:42:37 +0000 (16:42 -0800)]
Add Connect and Disconnect methods to LowEnergyClient

Change-Id: Ibabfd44575b7ab1c8fc7a57b844956038dd571c4

8 years agoSupport for A2DP Sink - Follow-up fix
Pavlin Radoslavov [Wed, 20 Jan 2016 18:41:01 +0000 (10:41 -0800)]
Support for A2DP Sink - Follow-up fix

Update the code so it matches the corresponding code in the internal tree.

Change-Id: I7cb143cde31e2cfca54b2172737cf262ae478186

8 years agoservice: add HAL for connect/disconnect
Jakub Pawlowski [Wed, 20 Jan 2016 00:35:20 +0000 (16:35 -0800)]
service: add HAL for connect/disconnect

Change-Id: I05b86af68e05433241d0206b0952d859483dee80

8 years ago Support for A2DP Sink and Proper initialization of profiles
Anubhav Gupta [Tue, 5 May 2015 07:45:07 +0000 (13:15 +0530)]
 Support for A2DP Sink and Proper initialization of profiles

 - Register SDP and SEP (Stream End Point) for the profile
   whose init is called. We achieve this by making registration
   api aware of profile id being called.
 - Register A2DP Src + Avrcp Target + Avrcp Controller. We need
   to support Absolute Volume as well, so Avrcp Controller is
   required here.
 - Register A2DP Sink + Avrcp Controller. In this case we do not
   support absolute volume. Support would be added in AVRCP
   controller change
 - Adapter property is updated with profile ID for which init is
   called.This is required to make changes in btService for Profile
   initialization
 - 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.
 - Drop Control, Meta and Browse commands when TG is not up.
 - Not to call AVRCP app callbacks when mentioned service is down.
 - Close audio socket on suspend

A2DP Sink: Support for AudioTrack

 - implemetation for audiotrack to take care of audio rendering
 - support for audio focus state in bluedroid

Bluetooth: Support for Avrcp 1.3  Controller

- support for SDP registration
- support for sending vendor dependant commands
- support for abs vol
- support for receiving vendor dependant response
- serialization of connection and rc_features callback

Avrcp_Ctrl: handling of commands and events for AVRCP Controller

- support of parsing cmd and event pdus
- timeout handling

Change-Id: I1e8d49b087eff6301373e1e90e8d868f15847c34

8 years agoMake list_foreach() more useful
Andre Eisenbach [Thu, 14 Jan 2016 05:20:59 +0000 (21:20 -0800)]
Make list_foreach() more useful

- Changed |callback| return type to bool to be able to interrupt
  iteration (to find specific elements for example).
- Added new |extra| parameter for |callback| so a pointer can be passed
  in to receive output values or to pass in criteria etc.
- Also added unit tests.

Change-Id: Id1ddcbabf55292f701d0277f2a1e9ec261b9fbde

8 years agoDo not send AT+CHLD=? if the 3-way call feature is not supported
Devin Kim [Thu, 14 Jan 2016 01:37:57 +0000 (10:37 +0900)]
Do not send AT+CHLD=? if the 3-way call feature is not supported

The HF shall not issue the AT+CHLD=? test command in case
either the HF or the AG does not support the Three-way calling feature.
Currently HF sends AT+CHLD=? to AG device when SLC sequence on going.
It affects to SCO statemachine so that after going out of range and
coming back in range while active call alives, SCO state goes bad and
never comes back. This is out of specification of HFP and it should be
fixed by checking peer and local 3way call capability check.

Bug: 25703926
Change-Id: I66adac2345c6fb0df6741fdbfa67d9483fc38a00

8 years agoservice: Implement IBinder.dump()
Marie Janssen [Mon, 14 Dec 2015 20:12:57 +0000 (12:12 -0800)]
service: Implement IBinder.dump()

Add dump() support to BluetoothBinderServer and change IBluetooth
implementation to allow the system to call it correctly.

Bug: 26095165
Change-Id: I32ca78e37484b5d748b8caf4c293aafcf01dfbff

8 years agoMerge "service: Add RegisterTestClient"
Jakub Pawlowski [Thu, 14 Jan 2016 20:51:24 +0000 (20:51 +0000)]
Merge "service: Add RegisterTestClient"

8 years agoservice: Add RegisterTestClient
Jakub Pawlowski [Wed, 13 Jan 2016 23:41:06 +0000 (15:41 -0800)]
service: Add RegisterTestClient

Extract registration code into separate helper, that'll be used in
tests that require more than one client.

Bug: 25744656
Change-Id: Ib3ceac8bba02cf1eb83f4265849ec423ad588e42

8 years agoservice: add scan support to bluetooth-cli
Jakub Pawlowski [Wed, 13 Jan 2016 19:28:08 +0000 (11:28 -0800)]
service: add scan support to bluetooth-cli

Adde the start-le-scan and stop-le-scan commands to
bluetooth-cli for testing.

Bug: 25744656
Change-Id: I02d42fcca071eebefd82f027cd9b89af27116a00

8 years agoservice: Add LE scan result support to Binder API
Arman Uguray [Thu, 3 Dec 2015 01:39:14 +0000 (17:39 -0800)]
service: Add LE scan result support to Binder API

Added Binder API documentation, bindings, and logic for BLE device
scan result.

Bug: 25744656
Change-Id: I5130a6b47438e266fab4a7b52b5372909824bc81

8 years agoservice: Add LE scan support to Binder API
Arman Uguray [Thu, 3 Dec 2015 01:39:14 +0000 (17:39 -0800)]
service: Add LE scan support to Binder API

Added Binder API documentation, bindings, and logic for BLE device
scans. Also added the start-le-scan and stop-le-scan commands to
bluetooth-cli for testing.

Bug: 25744656
Change-Id: I08c9d23ddd78cff1702495cf6d431cf5b9a7b894

8 years agoMerge "service: Add OnScanResult Delegate event."
Jakub Pawlowski [Wed, 13 Jan 2016 23:00:59 +0000 (23:00 +0000)]
Merge "service: Add OnScanResult Delegate event."

8 years agoMerge "service: Add Start|StopScan API to LowEnergyClient"
Jakub Pawlowski [Wed, 13 Jan 2016 23:00:35 +0000 (23:00 +0000)]
Merge "service: Add Start|StopScan API to LowEnergyClient"

8 years agoMerge "service: Parametrize LowEnergyClient with Adapter for tests"
Jakub Pawlowski [Wed, 13 Jan 2016 23:00:16 +0000 (23:00 +0000)]
Merge "service: Parametrize LowEnergyClient with Adapter for tests"

8 years agoOffload config save functionality to BTIF thread
Srinu Jella [Thu, 24 Dec 2015 12:10:52 +0000 (17:40 +0530)]
Offload config save functionality to BTIF thread

Offload config save functionality to btif thread from
timer thread as timer callback thread is critical in
a2dp playback case.

If the timer callback thread is busy in config save due
to IO operations, it may lead to a2dp audio choppy.

Fix to avoid the "bt_config.conf" file corruption from
the file system. This will avoid losing the paired
information in some corner case, such as abrupt power
off and on. This patch will ensure bt_config is saved to
NVRAM.

Bug: 24875861
CRs-Fixed: 953993
Change-Id: I893e9afefa89cbab6e7ddd8835ca77d3e316874c

8 years agoCorrectly verify return value of BTM_CancelInquiry
Yan Laijun [Wed, 13 Jan 2016 14:28:01 +0000 (22:28 +0800)]
Correctly verify return value of BTM_CancelInquiry

Change-Id: Iefb38023bc2b3e390eec14516f954e36f34ed5b4
Signed-off-by: Yan Laijun <yan.laijun@gmail.com>
8 years agoservice: Add OnScanResult Delegate event.
Arman Uguray [Thu, 3 Dec 2015 01:29:27 +0000 (17:29 -0800)]
service: Add OnScanResult Delegate event.

Added the LowEnergyClient::Delegate class and implemented scan result
reporting via the OnScanResult Delegate event.

Bug: 25744656
Change-Id: I050118c4f6761a7a32fa3ec8d9a1b41126a4c3ae

8 years agoservice: Add Start|StopScan API to LowEnergyClient
Arman Uguray [Mon, 30 Nov 2015 23:36:17 +0000 (15:36 -0800)]
service: Add Start|StopScan API to LowEnergyClient

Added the StartScan and StopScan methods to LowEnergyClient and basic unit
tests. This currently only supports regular scans with no batch scan or
hw/sw filters.

Bug: 25744656
Change-Id: Iddf6e897377f90a5eef81ef36696b1d7074a7dab

8 years agoservice: Parametrize LowEnergyClient with Adapter for tests
Jakub Pawlowski [Tue, 12 Jan 2016 21:51:35 +0000 (13:51 -0800)]
service: Parametrize LowEnergyClient with Adapter for tests

Bug: 25744656
Change-Id: I4eee8098c264c2135c2bb4f02a2319ba0dfec978

8 years agoservice/hal: Add per-client Scan interface
Arman Uguray [Mon, 30 Nov 2015 22:58:11 +0000 (14:58 -0800)]
service/hal: Add per-client Scan interface

Added a new per-client scan function to hal::BluetoothGattInterface.
The intention here is to push most of the per-client reference counting,
scan settings and filter coalescence below the HAL. This CL does this
first inside the Bluetooth daemon's HAL wrappers in a way that
represents what the future HAL scan API might look like.

This implements a basic reference counting scheme to share the global
controller scan session among different clients.

Bug: 25744656
Change-Id: I20c5cfc291be70d72576ebee014cc13544d5a299

8 years agoservice: use client_id instead of client_if
Jakub Pawlowski [Wed, 13 Jan 2016 18:19:34 +0000 (10:19 -0800)]
service: use client_id instead of client_if

Change-Id: Id045c81f748c99ab0525ce8869ef9cdd0207712e

8 years agoMerge "service: Rename variable holding advertisement settings"
Jakub Pawlowski [Tue, 12 Jan 2016 22:58:03 +0000 (22:58 +0000)]
Merge "service: Rename variable holding advertisement settings"

8 years agoservice: Rename variable holding advertisement settings
Jakub Pawlowski [Tue, 12 Jan 2016 21:43:33 +0000 (13:43 -0800)]
service: Rename variable holding advertisement settings

There will be more variables with settings. Make sure they
all have unique meaningful names.

Change-Id: I4b23fd3fa5a16f9132801b9141e4f8ed0be33be7

8 years agoMerge "Additional headsets blacklisted for absolute volume"
Andre Eisenbach [Tue, 12 Jan 2016 19:31:12 +0000 (19:31 +0000)]
Merge "Additional headsets blacklisted for absolute volume"

8 years agoservice: Make Adapter mockable.
Arman Uguray [Thu, 19 Nov 2015 23:57:57 +0000 (15:57 -0800)]
service: Make Adapter mockable.

Turned the Adapter class into an abstract interface so that we
can inject a mock Adapter in tests where there is an Adapter dependency
but where we don't care about side-effects/stack-calls created from the
Adapter.

Bug: 25744656

Change-Id: Ibf7dd9a4cc1008cbb36e60f7b87cfcb4ef2bd5d8

8 years agoAdditional headsets blacklisted for absolute volume
Andre Eisenbach [Tue, 12 Jan 2016 02:06:44 +0000 (18:06 -0800)]
Additional headsets blacklisted for absolute volume

Bug: 26070064
Change-Id: Ida1faec964982a4630f42ab378fe5b6dd6e21c16

8 years agoAssert on memory allocation failure
Andre Eisenbach [Mon, 11 Jan 2016 20:24:14 +0000 (12:24 -0800)]
Assert on memory allocation failure

This CL is a pre-cursor to cleaning up repeated memory allocation code
full of null-pointer checks. In the vast majority of cases in the
Bluetooth stack, a failed allocation is not recoverable and results in
undefined behaviour. By asserting, we can ensure we have a shot at
catching and fixing any issues not caused by OOM conditions.

Bug: 26494317
Change-Id: I53dff98c596068211934a1808f90de2d4484f952

8 years agoMerge "service: Add global scan support getters"
Jakub Pawlowski [Mon, 11 Jan 2016 22:15:47 +0000 (22:15 +0000)]
Merge "service: Add global scan support getters"

8 years agoImplement OOB pairing for LE devices using TK.
Jakub Pawlowski [Tue, 1 Dec 2015 20:14:22 +0000 (12:14 -0800)]
Implement OOB pairing for LE devices using TK.

This patch implements OOB pairing for LE devices using TK. Patches
for other pairing methods, and other transports will follow.

Bug: 22932952
Change-Id: Iad3c0c035de3b5a62ef24d3e3b655773fa03d5c1