OSDN Git Service

android-x86/system-bt.git
10 years agoAdd A2DP Sink Support
Hemant Gupta [Thu, 24 Oct 2013 10:07:17 +0000 (15:37 +0530)]
Add A2DP Sink Support

Change-Id: I9affefdd2d00597545e49c593ef3bddb110d4c9c

10 years agoBluetooth: Add support for HFP Client role.
Hemant Gupta [Mon, 19 Aug 2013 13:03:01 +0000 (18:33 +0530)]
Bluetooth: Add support for HFP Client role.

Implementation changes in BTA and BTIF layer to support
HFP Client role.

Change-Id: I9f939c18e8f989a50f298d0b313c5a0959c030a7

10 years agoEliminate dead code: remove GKI_sched* from the codebase.
Sharvil Nanavati [Fri, 6 Jun 2014 07:18:40 +0000 (00:18 -0700)]
Eliminate dead code: remove GKI_sched* from the codebase.

Change-Id: I607bd3bf88ef8847c8a7e984a54eabedd4fb7516

Conflicts:
bta/hf_client/bta_hf_client_api.c
bta/hf_client/bta_hf_client_main.c

10 years agoParse auto_pair_devlist.conf file with the generic config parser.
Sharvil Nanavati [Wed, 4 Jun 2014 01:12:32 +0000 (18:12 -0700)]
Parse auto_pair_devlist.conf file with the generic config parser.

Change-Id: Idfd1aca2417d74725a8f9ac67b1ca946a33bf14d

10 years agoFix build: BTM_BleLocalPrivacyEnabled is called from outside BLE_PRIVACY_SPT guard.
Sharvil Nanavati [Sat, 7 Jun 2014 07:56:14 +0000 (00:56 -0700)]
Fix build: BTM_BleLocalPrivacyEnabled is called from outside BLE_PRIVACY_SPT guard.

Change-Id: I1ca7f824e035b496c9c038b9afdb4c4f2af4234b

10 years agoDisable BLE address randomization since it causes excessive timer wakeups.
Sharvil Nanavati [Mon, 2 Jun 2014 05:38:46 +0000 (22:38 -0700)]
Disable BLE address randomization since it causes excessive timer wakeups.

Change-Id: Ib4c2265d30b8bbaa7b5302537e446e18a97e2cad

Conflicts:
stack/btm/btm_ble_multi_adv.c

10 years agoImplement GKI timers based on wake alarms and wake locks.
Sharvil Nanavati [Thu, 29 May 2014 00:09:46 +0000 (17:09 -0700)]
Implement GKI timers based on wake alarms and wake locks.

Before this change, bluedroid was unable to acquire wake locks
because the Bluetooth process didn't have permissions to write to
/sys/power/wake_*. We are now making wake locks accessible to
bluedroid through a HAL callout back into Java code.

The previous design did not use wake alarms. Bluedroid would attempt
to hold a wake lock until all pending timers expired, which is awful
if a timer is scheduled seconds or minutes from now. There is a
15min timer in bluedroid now so holding a wake lock for the entire
duration of pending alarms is unacceptable (power cost). The new
implementation uses a hybrid approach: if the next deadline is < 3s
away, we take a wake lock. If it is further than 3s away, we set a
wake alarm and release the wake lock.

As a result of this change, we have also eliminated a thread whose
sole purpose was to wake up every 10ms and update timers.

Change-Id: I46cd4edfcad2f5dce23c4003a14a617e7bf00541

10 years agoFix build for aosp_manta
Prerepa Viswanadham [Wed, 11 Jun 2014 04:04:43 +0000 (21:04 -0700)]
Fix build for aosp_manta

Change-Id: Ic1e2363e7fb7d23dcaef8e989cae37606f2af664

10 years agoAllow btsnoop logs to be read over a local socket.
Sharvil Nanavati [Sat, 22 Mar 2014 21:27:07 +0000 (14:27 -0700)]
Allow btsnoop logs to be read over a local socket.

This change allows real-time HCI debugging over adb from a
Linux box using hcidump.

Example:
--------
adb forward tcp:8872 tcp:8872
nc localhost 8872 | hcidump -X -r /dev/stdin

Change-Id: I49c32a941f71f612807061284a755a38b76588ff

10 years agoBluetooth: Assign max adv instance value from vendor capabilities
Nitin Arora [Fri, 6 Jun 2014 00:51:48 +0000 (17:51 -0700)]
Bluetooth: Assign max adv instance value from vendor capabilities

This change assigns the value of the max instances supported
for multiple advertisement, to the multi adv block

Change-Id: Ide181f8cad7a290a0dac8fdd01ae3ed2187868ef

10 years agoRename UNUSED to UNUSED_ATTR in OSI due to symbol collision.
Sharvil Nanavati [Tue, 3 Jun 2014 07:16:07 +0000 (00:16 -0700)]
Rename UNUSED to UNUSED_ATTR in OSI due to symbol collision.

Change-Id: Ib26dbae713b3096adf2496f0ff0fcb607693b163

10 years agoSupport for reading LE specific controller features
Ganesh Ganapathi Batta [Fri, 30 May 2014 23:28:00 +0000 (16:28 -0700)]
Support for reading LE specific controller features

Support for reading LE specific controller features via get adapter properties
API

Change-Id: Ia0b813be45fb826ce27d1d7a31ca41650d7286dd

10 years agoLogging cleanup: HCI and BTM trace macros.
Sharvil Nanavati [Sun, 4 May 2014 07:46:57 +0000 (00:46 -0700)]
Logging cleanup: HCI and BTM trace macros.

Change-Id: Icdea5aede9fde2c11d0cde745a9bedc26d69640c

Conflicts:
stack/btm/btm_acl.c
stack/btm/btm_ble.c
stack/btm/btm_ble_bgconn.c
stack/btm/btm_ble_gap.c
stack/btm/btm_inq.c
stack/btm/btm_pm.c
stack/btm/btm_sec.c

Conflicts:
stack/btm/btm_ble_gap.c
stack/btm/btm_sec.c

10 years agoWhitelist IPv6 packets so they can be sent over PAN.
Sharvil Nanavati [Sat, 31 May 2014 04:04:03 +0000 (21:04 -0700)]
Whitelist IPv6 packets so they can be sent over PAN.

Change-Id: I68e96bc34af1dfded2761c9bc780c089076d15e0

10 years agoUse an event file descriptor instead of a pipe to control userial.
Sharvil Nanavati [Sun, 27 Apr 2014 21:34:50 +0000 (14:34 -0700)]
Use an event file descriptor instead of a pipe to control userial.

Change-Id: I480752ab77a8d25eb2a2c770f7bb44f7e400b15f

10 years agoUse the generic config parser to parse bt_stack.conf.
Sharvil Nanavati [Mon, 5 May 2014 05:48:09 +0000 (22:48 -0700)]
Use the generic config parser to parse bt_stack.conf.

Change-Id: I4dc9307f5f5e0702c7a6283a59c94c56cead2eb6

10 years agoAdd a generic config parser for the INI file format.
Sharvil Nanavati [Mon, 5 May 2014 04:33:52 +0000 (21:33 -0700)]
Add a generic config parser for the INI file format.

There are currently multiple INI parsers in bluedroid and they're
special-purpose for the task at hand even though they parse the
same format. This implementation is general-purpose, loosely coupled
with the rest of bluedroid, and has unit tests to verify behaviour.

Change-Id: I61caf416cc16d76b871cbf04f333c26894ab3fef

10 years agoStart cleaning up log macros.
Sharvil Nanavati [Sun, 4 May 2014 06:06:49 +0000 (23:06 -0700)]
Start cleaning up log macros.

Change-Id: I228fef0198caeb47618a07c4c46526f611933e07

10 years agoAdd a couple more tests for list.
Sharvil Nanavati [Mon, 5 May 2014 04:53:31 +0000 (21:53 -0700)]
Add a couple more tests for list.

Change-Id: I603d8daa81075b93c26f997be2a7caa64370a9a8

10 years agoImplement a fixed queue.
Sharvil Nanavati [Sat, 3 May 2014 06:55:09 +0000 (23:55 -0700)]
Implement a fixed queue.

Change-Id: Ifad7605d0b6e1a57f4767f9de1bed7e99284ded7

10 years agoClean up the public functions in userial.c.
Sharvil Nanavati [Sat, 26 Apr 2014 17:40:30 +0000 (10:40 -0700)]
Clean up the public functions in userial.c.

Change-Id: I6513296a8c606c49a4cadf196d89573948026e4a

10 years agoEliminate dead code (helped by compiler warnings).
Sharvil Nanavati [Sat, 3 May 2014 22:33:15 +0000 (15:33 -0700)]
Eliminate dead code (helped by compiler warnings).

I've removed all functions that the compiler decided were unused.

Change-Id: I0cbddf874ebd1586abe29b80e8d6390680679542

10 years agoMinor cleanup of userial code.
Sharvil Nanavati [Sat, 26 Apr 2014 07:58:15 +0000 (00:58 -0700)]
Minor cleanup of userial code.

Change-Id: Ib8b094196f2de1515f79f17c4b87eb05f4c113dc

10 years agoUpdate RFCOMM socket code to use list data structure.
Sharvil Nanavati [Sat, 26 Apr 2014 05:38:55 +0000 (22:38 -0700)]
Update RFCOMM socket code to use list data structure.

Change-Id: I70402d8bfaa36b36d3d4b8f3cec98371691e86c9

10 years agoUpdate btif_profile_queue to use the list data structure.
Sharvil Nanavati [Sat, 26 Apr 2014 06:16:01 +0000 (23:16 -0700)]
Update btif_profile_queue to use the list data structure.

The profile queue maintains a list of pending connect operations
for each profile. If a connect is followed by a disconnect before
the queued connect is dispatched, the disconnect will have no
effect and the connect will proceed.

This code clearly needs to be re-thought; it may be a good idea to
abandon the connect queue entirely in the long-run.

Change-Id: Ic0e85654abcf7a47f65953edb301eb9524394950

10 years agoAdd a singly linked list implementation for OSI.
Sharvil Nanavati [Thu, 24 Apr 2014 23:22:45 +0000 (16:22 -0700)]
Add a singly linked list implementation for OSI.

Change-Id: Ifffd6f9eabee482a81b326c9cf8d06163aede0f4

10 years agoBluetooth: On Suspend ignore media task timer event
Hemant Gupta [Thu, 5 Sep 2013 14:12:50 +0000 (19:42 +0530)]
Bluetooth: On Suspend ignore media task timer event

On Recieving Suspend confirmation from remote device,
Media task timer reload and tx_timer is made false,
hence media task will not be stopped at that instant.
Media task timer expires causing buffer to be allocated.
Changes done to ensure buffer is allocated only if tx_timer
is true.

Change-Id: I971a82cccc64ba033475ad532b096862968de942

10 years agoam ded6d338: am bbad5649: Merge "Bluedroid: Fix HCI buffer size issue"
Matthew Xie [Wed, 11 Jun 2014 20:49:54 +0000 (20:49 +0000)]
am ded6d338: am bbad5649: Merge "Bluedroid: Fix HCI buffer size issue"

* commit 'ded6d338ea908de48e1b84384993a8ec41867910':
  Bluedroid: Fix HCI buffer size issue

10 years agoam 8b8050ad: am 197a801b: Merge "Bluedroid: Fix UUID unsigned/signed comparison"
Matthew Xie [Wed, 11 Jun 2014 20:49:42 +0000 (20:49 +0000)]
am 8b8050ad: am 197a801b: Merge "Bluedroid: Fix UUID unsigned/signed comparison"

* commit '8b8050ad5f2f4fd64766c99378fa0866d89230c6':
  Bluedroid: Fix UUID unsigned/signed comparison

10 years agoam bbad5649: Merge "Bluedroid: Fix HCI buffer size issue"
Matthew Xie [Wed, 11 Jun 2014 01:06:17 +0000 (01:06 +0000)]
am bbad5649: Merge "Bluedroid: Fix HCI buffer size issue"

* commit 'bbad564995006590114f370a036d545da7182425':
  Bluedroid: Fix HCI buffer size issue

10 years agoam 197a801b: Merge "Bluedroid: Fix UUID unsigned/signed comparison"
Matthew Xie [Tue, 10 Jun 2014 23:43:09 +0000 (23:43 +0000)]
am 197a801b: Merge "Bluedroid: Fix UUID unsigned/signed comparison"

* commit '197a801bb5f12675d025bf1b7d2cac40924abe77':
  Bluedroid: Fix UUID unsigned/signed comparison

10 years agoMerge "Bluedroid: Fix UUID unsigned/signed comparison"
Matthew Xie [Tue, 10 Jun 2014 23:34:17 +0000 (23:34 +0000)]
Merge "Bluedroid: Fix UUID unsigned/signed comparison"

10 years agoMerge "Bluedroid: Fix HCI buffer size issue"
Matthew Xie [Wed, 11 Jun 2014 01:02:21 +0000 (01:02 +0000)]
Merge "Bluedroid: Fix HCI buffer size issue"

10 years agoBluedroid: Fix HCI buffer size issue
Loic Poulain [Fri, 4 Apr 2014 08:05:05 +0000 (10:05 +0200)]
Bluedroid: Fix HCI buffer size issue

The maximum HCI frame coming from the kernel is
the maximum ACL HCI data packet (1024) + ACL HCI
header (4) + H4 header (1) = 1029.
Previous maximum read value was 1016 which is
incorrect and leads to data sync problem for
frames > 1016.

Change-Id: I37f74ad4c612d802e6758b3fe0eb156bcf265b4f
Signed-off-by: Loic Poulain <loic.poulain@intel.com>
10 years agoMerge "Changed the status check for BleObserve"
Wei Wang [Fri, 6 Jun 2014 23:07:41 +0000 (23:07 +0000)]
Merge "Changed the status check for BleObserve"

10 years agoChanged the status check for BleObserve
Priti Aghera [Fri, 6 Jun 2014 20:54:08 +0000 (13:54 -0700)]
Changed the status check for BleObserve

Bta layer was expecting a successful BLEObserver return status to be BTM_SUCCESS.
Instead BleObserve returns BTM_CMD_STARTED when the scanning is successfully
started. Changed the check to be BTM_CMD_STARTED instead

bug 15167442

Change-Id: Ia600da7e6416e2caef5d34dba24955ae76d06dcc

10 years agoMerge "fix compliation when BLE_VND_INCLUDED is false"
Adam Hampson [Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)]
Merge "fix compliation when BLE_VND_INCLUDED is false"

10 years agoMerge "ble: use appearance uuid to determine class of device"
Adam Hampson [Mon, 2 Jun 2014 17:15:22 +0000 (17:15 +0000)]
Merge "ble: use appearance uuid to determine class of device"

10 years agoam 66988a02: This patch contains bug fixes for solving race conditions for multiple...
Nitin Arora [Fri, 30 May 2014 22:39:52 +0000 (22:39 +0000)]
am 66988a02: This patch contains bug fixes for solving race conditions for multiple advertisers and incorrect VS command length which makes uuid filters not working.

* commit '66988a022d219f5385b3f76e3ae26566ad80fb86':
  This patch contains bug fixes for solving race conditions for multiple advertisers and incorrect VS command length which makes uuid filters not working.

10 years agofix compliation when BLE_VND_INCLUDED is false
Adam Hampson [Tue, 27 May 2014 20:14:30 +0000 (13:14 -0700)]
fix compliation when BLE_VND_INCLUDED is false

Change-Id: I48785d6d36965fb03657523ee6eb48cb63fd5364
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoble: use appearance uuid to determine class of device
Adam Hampson [Fri, 30 May 2014 22:07:08 +0000 (15:07 -0700)]
ble: use appearance uuid to determine class of device

The current code is inferring the cod of a ble hid device based on
the service type.  This change uses the appearance uuid to map to
to an equivalent cod.

Bug: 15346094

Change-Id: I6ab2c49bc5e7e956a285c9684ddefb339944a3dc
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoThis patch contains bug fixes for solving race conditions for multiple
Nitin Arora [Thu, 29 May 2014 01:50:09 +0000 (18:50 -0700)]
This patch contains bug fixes for solving race conditions for multiple
advertisers and incorrect VS command length which makes uuid filters not
working.

b/15094154, b/15174583

Change-Id: I78746b923301fa47afb21f8bedb0d79b42f492b9

10 years agoam 1fe4bc94: am 6e12f443: include bdroid_buildcfg.h from device repo
Heather Lee Wilson [Wed, 28 May 2014 23:59:27 +0000 (23:59 +0000)]
am 1fe4bc94: am 6e12f443: include bdroid_buildcfg.h from device repo

* commit '1fe4bc94b561b08b08d13650c54d74ae3b041883':
  include bdroid_buildcfg.h from device repo

10 years agoam 6e12f443: include bdroid_buildcfg.h from device repo
Heather Lee Wilson [Wed, 28 May 2014 23:54:04 +0000 (23:54 +0000)]
am 6e12f443: include bdroid_buildcfg.h from device repo

* commit '6e12f443720a668c72d308ad6bde3146184a4124':
  include bdroid_buildcfg.h from device repo

10 years agofix compilation when BLE_PRIVACY_SPT is false
Adam Hampson [Tue, 27 May 2014 20:15:20 +0000 (13:15 -0700)]
fix compilation when BLE_PRIVACY_SPT is false

Change-Id: Ifdef940347bbbd97e81956a1a7dbf52a0d0ea146
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoinclude bdroid_buildcfg.h from device repo
Heather Lee Wilson [Wed, 28 May 2014 20:34:55 +0000 (13:34 -0700)]
include bdroid_buildcfg.h from device repo

Fixes Bluetooth tethering issues where BTHC_USERIAL_READ_MEM_SIZE needs to be
set to a higher value.

Change-Id: Ia8db682aadee3ccff8aba1ce27e18a093a78db9c

10 years agoMerge "Initialize the DIS client before requesting DIS UUIDs from peer"
Adam Hampson [Wed, 28 May 2014 19:03:40 +0000 (19:03 +0000)]
Merge "Initialize the DIS client before requesting DIS UUIDs from peer"

10 years agoMerge "ble: handle multiple events within HCI_BLE_ADV_PKT_RPT_EVT HCI event"
Adam Hampson [Wed, 28 May 2014 18:58:51 +0000 (18:58 +0000)]
Merge "ble: handle multiple events within HCI_BLE_ADV_PKT_RPT_EVT HCI event"

10 years agoMerge "Change error message to debug to avoid spamming"
Matthew Xie [Wed, 28 May 2014 18:19:09 +0000 (18:19 +0000)]
Merge "Change error message to debug to avoid spamming"

10 years agoChange error message to debug to avoid spamming
Matthew Xie [Wed, 28 May 2014 18:16:54 +0000 (11:16 -0700)]
Change error message to debug to avoid spamming

bug 15116703

Change-Id: I7b218418b1a57c3d68d6b239f961a930f0c98371

10 years agoInitialize the DIS client before requesting DIS UUIDs from peer
Adam Hampson [Wed, 28 May 2014 16:31:59 +0000 (09:31 -0700)]
Initialize the DIS client before requesting DIS UUIDs from peer

Bug: 15308663

Change-Id: I586c486f838e1742db1785e79ca1451b33b21367
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoble: handle multiple events within HCI_BLE_ADV_PKT_RPT_EVT HCI event
Adam Hampson [Tue, 27 May 2014 17:48:19 +0000 (10:48 -0700)]
ble: handle multiple events within HCI_BLE_ADV_PKT_RPT_EVT HCI event

The Marvell 8797 chip will report both BTM_BLE_CONNECT_EVT and
BTM_BLE_SCAN_RSP_EVT events in a single HCI event.

Bug: 14386651

Change-Id: Id922dff9fa7f6ae8fc15ebbcca4fb9ec537e9f26
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoam 25fdacfa: (-s ours) DO NOT MERGE: add support for custom sniff configuration
Adam Hampson [Tue, 27 May 2014 17:13:05 +0000 (17:13 +0000)]
am 25fdacfa: (-s ours) DO NOT MERGE: add support for custom sniff configuration

* commit '25fdacfa0bae80a45541a9f4ecf22d6fad431326':
  DO NOT MERGE: add support for custom sniff configuration

10 years agoam 9b66c052: merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e...
The Android Automerger [Tue, 27 May 2014 17:13:05 +0000 (17:13 +0000)]
am 9b66c052: merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0

* commit '9b66c0521e3048d45f0f5c4e9eac2a9c3347833f':
  Unable to pair and connect A2DP headset with DUT on KWD
  Fix data type for rmt_auth_req; it stores an integral value.

10 years agoDO NOT MERGE: add support for custom sniff configuration
Adam Hampson [Mon, 19 May 2014 23:23:45 +0000 (16:23 -0700)]
DO NOT MERGE: add support for custom sniff configuration

This change allows the bta_dm_pm_md table defined in bta_dm_cfg.c
to be overridden in bdroid_buildcfg.h

This also changes how the bta_dm_pm_spec table references sniff
parameters in the bta_dm_pm_md.  Indexing into the bta_dm_pm_md
table is now through an overrideable define instead of directly
referencing the index into the table.

Lastly this change allows for overriding the open, active, and
idle states of the HID host power table indepednent of the HID
device power table.

Bug: 13329024

Change-Id: If1eea95ebdd3efd48c69bf4cc6f2ffe06219c80b
Signed-off-by: Adam Hampson <ahampson@google.com>
(cherry picked from commit 63399d943938cb7234a7fba508ea603070720d77)

10 years agoRevert "add wakelock control callback"
Matthew Xie [Fri, 23 May 2014 23:58:42 +0000 (16:58 -0700)]
Revert "add wakelock control callback"

This reverts commit cd7896c5c4bffa5a6f9a414177ea0038d6172964.

10 years agoam 262685fe: am cd7896c5: add wakelock control callback
Dmitry Grinberg [Fri, 23 May 2014 21:46:01 +0000 (21:46 +0000)]
am 262685fe: am cd7896c5: add wakelock control callback

* commit '262685fe26c0ccc7e196def7db1d7447c51efdbb':
  add wakelock control callback

10 years agoam cd7896c5: add wakelock control callback
Dmitry Grinberg [Fri, 23 May 2014 21:40:03 +0000 (21:40 +0000)]
am cd7896c5: add wakelock control callback

* commit 'cd7896c5c4bffa5a6f9a414177ea0038d6172964':
  add wakelock control callback

10 years agoadd wakelock control callback
Dmitry Grinberg [Wed, 21 May 2014 23:27:50 +0000 (16:27 -0700)]
add wakelock control callback

Change-Id: Iffa8f33767a037fceb4757cdff07f25f30acf453

10 years agoadd support for custom sniff configuration
Adam Hampson [Mon, 19 May 2014 23:23:45 +0000 (16:23 -0700)]
add support for custom sniff configuration

This change allows the bta_dm_pm_md table defined in bta_dm_cfg.c
to be overridden in bdroid_buildcfg.h

This also changes how the bta_dm_pm_spec table references sniff
parameters in the bta_dm_pm_md.  Indexing into the bta_dm_pm_md
table is now through an overrideable define instead of directly
referencing the index into the table.

Lastly this change allows for overriding the open, active, and
idle states of the HID host power table indepednent of the HID
device power table.

Bug: 13329024

Change-Id: If1eea95ebdd3efd48c69bf4cc6f2ffe06219c80b
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agomerge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0
The Android Automerger [Thu, 22 May 2014 14:21:32 +0000 (07:21 -0700)]
merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0

10 years agomerge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0
The Android Automerger [Thu, 22 May 2014 12:49:37 +0000 (05:49 -0700)]
merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0

10 years agomerge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0
The Android Automerger [Wed, 21 May 2014 12:49:33 +0000 (05:49 -0700)]
merge in master-release history after reset to a8cc49e09e09590f0f5a2a42e8229aa7338439a0

10 years agoMerge "Change a TRACE_ERROR message to TRACE_DEBUG on every LE report"
Mike J. Chen [Tue, 20 May 2014 20:18:10 +0000 (20:18 +0000)]
Merge "Change a TRACE_ERROR message to TRACE_DEBUG on every LE report"

10 years agoChange a TRACE_ERROR message to TRACE_DEBUG on every LE report
Mike J. Chen [Mon, 19 May 2014 21:38:34 +0000 (14:38 -0700)]
Change a TRACE_ERROR message to TRACE_DEBUG on every LE report

Change-Id: If07fdfb69dcfc0f9c983f9e4f42ee8d1bb615d1b
Signed-off-by: Mike J. Chen <mjchen@google.com>
10 years agomerge in master-release history after reset to 2a647f406c94a3a85e984c23428260dddea3f4ee
The Android Automerger [Tue, 20 May 2014 12:49:30 +0000 (05:49 -0700)]
merge in master-release history after reset to 2a647f406c94a3a85e984c23428260dddea3f4ee

10 years agoAdd bt_target.h header
Wei Wang [Tue, 20 May 2014 08:21:37 +0000 (01:21 -0700)]
Add bt_target.h header

Change-Id: I6b584e3e610d20348bf410f434164b8a5e738f04

10 years agoFix build issue for devices without BLE features.
Wei Wang [Tue, 20 May 2014 06:23:35 +0000 (23:23 -0700)]
Fix build issue for devices without BLE features.

Change-Id: I6499663d253c791cc739ed76b839eb3aefe6613a

Conflicts:
btif/src/btif_dm.c
btif/src/btif_gatt_multi_adv_util.c

Conflicts:
btif/src/btif_dm.c
btif/src/btif_gatt_multi_adv_util.c

10 years agoRevert "Revert "LE: Add RRA offloading and vendor specific PCF commands""
Wei Wang [Tue, 20 May 2014 06:30:13 +0000 (06:30 +0000)]
Revert "Revert "LE: Add RRA offloading and vendor specific PCF commands""

This reverts commit 146bb736bc1cdfd679bbafcf3f33c7af612096b9.

Change-Id: Ie4e6b4d7118a622d04c46623add1073906366edf

10 years agoRevert "Revert "LE Multi ADV feature""
Wei Wang [Tue, 20 May 2014 06:30:32 +0000 (06:30 +0000)]
Revert "Revert "LE Multi ADV feature""

This reverts commit ea85048a8e86b1e1b6b725649f6bb0834ba17301.

Change-Id: I9a9305db4fabff07b4309a38f65361dca3f5f37c

10 years agoRevert "LE Multi ADV feature"
Wei Wang [Tue, 20 May 2014 04:52:26 +0000 (04:52 +0000)]
Revert "LE Multi ADV feature"

This reverts commit 87776cf5e201b18646cbc16f11a7110d5ffe510c.

Change-Id: I5b544a5c965999096b665b1bd2edb021e3054be8

10 years agoRevert "LE: Add RRA offloading and vendor specific PCF commands"
Wei Wang [Tue, 20 May 2014 04:52:31 +0000 (04:52 +0000)]
Revert "LE: Add RRA offloading and vendor specific PCF commands"

This reverts commit 15fa3be8ecd576b9ef88e20cf9a6f4bd765cbc6b.

Change-Id: Iaa484508ac664d4cb6c94758c2984d53263a902a

10 years agoLE: Add RRA offloading and vendor specific PCF commands
Satya Calloji [Mon, 12 May 2014 16:13:02 +0000 (09:13 -0700)]
LE: Add RRA offloading and vendor specific PCF commands

Change-Id: Iadca8e73ceaadcd0429421ea70f1b76644e88c42

10 years agoLE Multi ADV feature
Satya Calloji [Wed, 30 Apr 2014 22:55:39 +0000 (15:55 -0700)]
LE Multi ADV feature

BTIF and stack changes for LE multi ADV feature

Change-Id: I5e009ff8cbac5fc6f92ca943c61c4faf98e4e2ce

10 years agoMerge "fix uninitialized fields in tBTM_PM_PWR_MD structs"
Adam Hampson [Tue, 20 May 2014 00:00:32 +0000 (00:00 +0000)]
Merge "fix uninitialized fields in tBTM_PM_PWR_MD structs"

10 years agoam 1e3da5c0: am 919f43b8: Fix ms to ns conversion unit
Matthew Xie [Mon, 19 May 2014 15:05:25 +0000 (15:05 +0000)]
am 1e3da5c0: am 919f43b8: Fix ms to ns conversion unit

* commit '1e3da5c0228e6f32f116da104bef565ea520c1d1':
  Fix ms to ns conversion unit

10 years agoam 919f43b8: Fix ms to ns conversion unit
Matthew Xie [Mon, 19 May 2014 15:01:32 +0000 (15:01 +0000)]
am 919f43b8: Fix ms to ns conversion unit

* commit '919f43b89e9c2a3534b2a52177ff35b670a343f8':
  Fix ms to ns conversion unit

10 years agomerge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a
The Android Automerger [Mon, 19 May 2014 12:49:26 +0000 (05:49 -0700)]
merge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a

10 years agomerge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a
The Android Automerger [Sun, 18 May 2014 12:49:20 +0000 (05:49 -0700)]
merge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a

10 years agomerge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a
The Android Automerger [Sat, 17 May 2014 12:49:44 +0000 (05:49 -0700)]
merge in master-release history after reset to f89dc4619eb789ff89b97ede1824cb112037378a

10 years agofix uninitialized fields in tBTM_PM_PWR_MD structs
Adam Hampson [Fri, 16 May 2014 23:41:22 +0000 (16:41 -0700)]
fix uninitialized fields in tBTM_PM_PWR_MD structs

This could potentially cause BTM_SetPowerMode() to take an
incorrect code path.

Change-Id: Ibca83129fffb5fbb64372e991cc433de144d333d
Signed-off-by: Adam Hampson <ahampson@google.com>
10 years agoFix ms to ns conversion unit
Matthew Xie [Fri, 16 May 2014 22:00:57 +0000 (15:00 -0700)]
Fix ms to ns conversion unit

bug 14999968
Change-Id: I38455af24a4127e3915024a38ced758d82d406eb
(cherry picked from commit ac11e391f935cd4255d3956acddecc82236b3bda)

10 years agoMerge "Fix ms to ns conversion unit"
Matthew Xie [Fri, 16 May 2014 22:29:58 +0000 (22:29 +0000)]
Merge "Fix ms to ns conversion unit"

10 years agoFix ms to ns conversion unit
Matthew Xie [Fri, 16 May 2014 22:00:57 +0000 (15:00 -0700)]
Fix ms to ns conversion unit

bug 14999968
Change-Id: I38455af24a4127e3915024a38ced758d82d406eb

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Thu, 15 May 2014 12:49:38 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Wed, 14 May 2014 12:49:50 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agoLE: Add API to set scan interval and window (2/4)
Prerepa Viswanadham [Fri, 9 May 2014 23:08:49 +0000 (16:08 -0700)]
LE: Add API to set scan interval and window (2/4)
Delete client_if from scan api's
Change-Id: I66e0e17221601cd07ea77cf3d61ad9ce20a603a4

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Tue, 13 May 2014 12:49:35 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Mon, 12 May 2014 12:49:22 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Sun, 11 May 2014 12:49:19 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agomerge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c
The Android Automerger [Sat, 10 May 2014 12:49:36 +0000 (05:49 -0700)]
merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c

10 years agoMerge "Init variables to fix compiler error"
Matthew Xie [Fri, 9 May 2014 17:06:00 +0000 (17:06 +0000)]
Merge "Init variables to fix compiler error"

10 years agoMerge "Revert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS""
Matthew Xie [Fri, 9 May 2014 17:05:40 +0000 (17:05 +0000)]
Merge "Revert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS""

10 years agoUnable to pair and connect A2DP headset with DUT on KWD
Zhihai Xu [Thu, 8 May 2014 23:39:34 +0000 (16:39 -0700)]
Unable to pair and connect A2DP headset with DUT on KWD

this is due to some field type is not defined correctly.
We don't have this problem with old compile option.
recently some compile option change expose this bug.

bug:14489818
Change-Id: Ief48ec7d1312eb588fc344ea0afb153226bf0541

10 years agoFix data type for rmt_auth_req; it stores an integral value.
Sharvil Nanavati [Sat, 3 May 2014 19:11:15 +0000 (12:11 -0700)]
Fix data type for rmt_auth_req; it stores an integral value.

This broke pairing in a bunch of ways, most notably the inability
to use Just Works pairing mode. Just Works is used quite heavily
by iOS devices.

http://b/14438257

Change-Id: I4d32b446d0435acfc73987b91dbd1a0bd3b53ec3

10 years agoInit variables to fix compiler error
Matthew Xie [Fri, 9 May 2014 08:04:04 +0000 (01:04 -0700)]
Init variables to fix compiler error

Change-Id: Ib41ecc8be53f64f10446b758c54eaf41f2a2e725

10 years agoRevert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS"
Matthew Xie [Fri, 9 May 2014 05:20:36 +0000 (22:20 -0700)]
Revert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS"

This reverts commit 5e18c1746f086f46177d64563b25db6bdd31223a.

10 years agoUnable to pair and connect A2DP headset with DUT on KWD
Zhihai Xu [Thu, 8 May 2014 23:39:34 +0000 (16:39 -0700)]
Unable to pair and connect A2DP headset with DUT on KWD

this is due to some field type is not defined correctly.
We don't have this problem with old compile option.
recently some compile option change expose this bug.

bug:14489818
Change-Id: Ief48ec7d1312eb588fc344ea0afb153226bf0541

10 years agoFix data type for rmt_auth_req; it stores an integral value.
Sharvil Nanavati [Sat, 3 May 2014 19:11:15 +0000 (12:11 -0700)]
Fix data type for rmt_auth_req; it stores an integral value.

This broke pairing in a bunch of ways, most notably the inability
to use Just Works pairing mode. Just Works is used quite heavily
by iOS devices.

http://b/14438257

Change-Id: I4d32b446d0435acfc73987b91dbd1a0bd3b53ec3

10 years agoam 6ddda3a8: (-s ours) am c90b5ab2: DO NOT MERGE: allow customization of sniff params
Dmitry Grinberg [Thu, 8 May 2014 18:31:26 +0000 (18:31 +0000)]
am 6ddda3a8: (-s ours) am c90b5ab2: DO NOT MERGE: allow customization of sniff params

* commit '6ddda3a87d8ab516cd996cd1bf59b33c3136d7ee':
  DO NOT MERGE: allow customization of sniff params