OSDN Git Service
Sharvil Nanavati [Sat, 26 Apr 2014 07:58:15 +0000 (00:58 -0700)]
Minor cleanup of userial code.
Change-Id: Ib8b094196f2de1515f79f17c4b87eb05f4c113dc
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
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
Sharvil Nanavati [Thu, 24 Apr 2014 23:22:45 +0000 (16:22 -0700)]
Add a singly linked list implementation for OSI.
Change-Id: Ifffd6f9eabee482a81b326c9cf8d06163aede0f4
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
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
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
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
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
Matthew Xie [Tue, 10 Jun 2014 23:34:17 +0000 (23:34 +0000)]
Merge "Bluedroid: Fix UUID unsigned/signed comparison"
Matthew Xie [Wed, 11 Jun 2014 01:02:21 +0000 (01:02 +0000)]
Merge "Bluedroid: 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>
Wei Wang [Fri, 6 Jun 2014 23:07:41 +0000 (23:07 +0000)]
Merge "Changed 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
Adam Hampson [Mon, 2 Jun 2014 17:57:26 +0000 (17:57 +0000)]
Merge "fix compliation when BLE_VND_INCLUDED is false"
Adam Hampson [Mon, 2 Jun 2014 17:15:22 +0000 (17:15 +0000)]
Merge "ble: use appearance uuid to determine class of device"
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.
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>
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>
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
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
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
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>
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
Adam Hampson [Wed, 28 May 2014 19:03:40 +0000 (19:03 +0000)]
Merge "Initialize the DIS client before requesting DIS UUIDs from peer"
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"
Matthew Xie [Wed, 28 May 2014 18:19:09 +0000 (18:19 +0000)]
Merge "Change 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
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>
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>
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
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.
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)
Matthew Xie [Fri, 23 May 2014 23:58:42 +0000 (16:58 -0700)]
Revert "add wakelock control callback"
This reverts commit
cd7896c5c4bffa5a6f9a414177ea0038d6172964.
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
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
Dmitry Grinberg [Wed, 21 May 2014 23:27:50 +0000 (16:27 -0700)]
add wakelock control callback
Change-Id: Iffa8f33767a037fceb4757cdff07f25f30acf453
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>
The Android Automerger [Thu, 22 May 2014 14:21:32 +0000 (07:21 -0700)]
merge 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
The Android Automerger [Wed, 21 May 2014 12:49:33 +0000 (05:49 -0700)]
merge in master-release history after reset to
a8cc49e09e09590f0f5a2a42e8229aa7338439a0
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"
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>
The Android Automerger [Tue, 20 May 2014 12:49:30 +0000 (05:49 -0700)]
merge in master-release history after reset to
2a647f406c94a3a85e984c23428260dddea3f4ee
Wei Wang [Tue, 20 May 2014 08:21:37 +0000 (01:21 -0700)]
Add bt_target.h header
Change-Id: I6b584e3e610d20348bf410f434164b8a5e738f04
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
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
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
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
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
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
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
Adam Hampson [Tue, 20 May 2014 00:00:32 +0000 (00:00 +0000)]
Merge "fix uninitialized fields in tBTM_PM_PWR_MD structs"
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
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
The Android Automerger [Mon, 19 May 2014 12:49:26 +0000 (05:49 -0700)]
merge 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
The Android Automerger [Sat, 17 May 2014 12:49:44 +0000 (05:49 -0700)]
merge in master-release history after reset to
f89dc4619eb789ff89b97ede1824cb112037378a
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>
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)
Matthew Xie [Fri, 16 May 2014 22:29:58 +0000 (22:29 +0000)]
Merge "Fix 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
The Android Automerger [Thu, 15 May 2014 12:49:38 +0000 (05:49 -0700)]
merge 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
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
The Android Automerger [Tue, 13 May 2014 12:49:35 +0000 (05:49 -0700)]
merge 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
The Android Automerger [Sun, 11 May 2014 12:49:19 +0000 (05:49 -0700)]
merge 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
Matthew Xie [Fri, 9 May 2014 17:06:00 +0000 (17:06 +0000)]
Merge "Init variables to fix compiler error"
Matthew Xie [Fri, 9 May 2014 17:05:40 +0000 (17:05 +0000)]
Merge "Revert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS""
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
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
Matthew Xie [Fri, 9 May 2014 08:04:04 +0000 (01:04 -0700)]
Init variables to fix compiler error
Change-Id: Ib41ecc8be53f64f10446b758c54eaf41f2a2e725
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.
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
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
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
Ying Wang [Thu, 8 May 2014 18:00:51 +0000 (18:00 +0000)]
am
bb170e66: am
643e0310: am
556cc857: Merge "Remove unused LOCAL_LDLIBS."
* commit '
bb170e660e50a0183263a4991bd84a2357f45134':
Remove unused LOCAL_LDLIBS.
Ji-Hwan Lee [Thu, 8 May 2014 13:28:16 +0000 (22:28 +0900)]
Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS
To fix x86 build.
Change-Id: I14e1a418c19987fb76c71ab1bbb8dcb181b833ce
Dmitry Grinberg [Thu, 8 May 2014 00:53:52 +0000 (00:53 +0000)]
am
c90b5ab2: DO NOT MERGE: allow customization of sniff params
* commit '
c90b5ab247ce9e297e4185444b2e623a799fe447':
DO NOT MERGE: allow customization of sniff params
Ying Wang [Wed, 7 May 2014 22:53:34 +0000 (22:53 +0000)]
am
643e0310: am
556cc857: Merge "Remove unused LOCAL_LDLIBS."
* commit '
643e0310fed3ccb238abef7a85d70442b84fbc06':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:47:17 +0000 (22:47 +0000)]
am
556cc857: Merge "Remove unused LOCAL_LDLIBS."
* commit '
556cc857c33ed1043e6c8a1f9235ac3eab058251':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:44:06 +0000 (22:44 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Dmitry Grinberg [Wed, 7 May 2014 21:25:10 +0000 (14:25 -0700)]
DO NOT MERGE: allow customization of sniff params
This completely overrides sniff params with hardcoded external values.
Yes, we understand this is not likely to be useful in ther real world.
This was requested by a vendor for power testing purposes.
Change-Id: Iaf03516752ea49fff2f0be28d5a4b27b039f1214
Ying Wang [Wed, 7 May 2014 22:11:56 +0000 (15:11 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: Ic5b17ad79d5796692c063714ea82f879c52b9857
Narayan Kamath [Wed, 7 May 2014 10:18:11 +0000 (11:18 +0100)]
Fix-build : Do not build bluedroid for 64 bit targets.
This code is not 64 bit safe. In particular, it attempts
to cast pointer types to UINT32 in several places. For now,
build it as a 32 bit library. A 64 bit variant will not be
needed if libbluetooth_jni is also build for 32 bit only.
Change-Id: Ic5f86bd2823083cacf21a852d1c13b4796a7e125
Matthew Xie [Wed, 7 May 2014 06:10:21 +0000 (23:10 -0700)]
fix incorrect function declaration of pan_control_state_changed
Change-Id: If4b857544917a13647959793fca32c5e5c59a05a
Hemant Gupta [Fri, 2 May 2014 19:01:26 +0000 (00:31 +0530)]
HID: Send Close event to upper layers during reconnection
This patch sends close event callback to upper layers, so that UI
is updated of correct state of HID connection when connection
between hid host and hid device drops for some reason and host is
attempting reconnection. Without this patch, upper layers gives
false update of connection still present when actually no connection
exists between hid devices. Connection state was only getting updated
if reconnection attempt was also failing.
Change-Id: Ic276d9b57c5c84c4264ddeeadc34c983c718ba3a
Hemant Gupta [Thu, 19 Dec 2013 15:07:16 +0000 (20:37 +0530)]
GAP: Return BTM_CMD_STARTED from btm_sec_l2cap_access_req
Return BTM_CMD_STARTED from btm_sec_l2cap_access_req when
remote device link is neither authenticated or encrypted so as
to send L2CAP Peer connect response with status auth pending.
This lets remote device extend the waiting time. This fixes IOT
issues with HP laptop EliteBook 8440p/8460p where pairing was
not possible.
Change-Id: I6cf6a72640de938a8145b541d4bad1bcba758ac5
Hemant Gupta [Mon, 5 May 2014 12:15:08 +0000 (17:45 +0530)]
MHF: Route call to correct HS in multi call scenario.
- This change makes sure that audio routes back to correct
headset in multi call scenario even though the other
headset tries to answer or dial.
- Ignore setting hf_idx for ATA/BLDN received from HS
for a waiting call when an active/held call is already
present.
Change-Id: I19949471d481bf911fda2222dc6d730d1a821b65
Ganesh Ganapathi Batta [Mon, 28 Apr 2014 23:30:55 +0000 (16:30 -0700)]
Resolve Pairing failure with IPhone
When pairing is initiated from the iPhone side, it sets Bonding bit
without MITM. We responded to this with No bonding, No MITM. This resulted
in JustWorks & Unauthenticated link key. After pairing iPhone initiates a
RFCOMM connection. This caused a link key upgrade to be done, which the iPhone
rejected, resulting in pairing failure. To resolve this the following
enhancements were made
1. If locally initiated pairing always set Bonding bit + MITM
2. If remote initiated
a. copy over the bonding bit
b. if peer has DisplayYesNo set MITM
3. As a fallback if remote had MITM, enable MITM in our response
This forces pairing to use Bonding bit+MITM thus resulting in authenticated
combination linkkey
Change-Id: I08f16c80821bc822023180d01868614ba41e6d88
Sharvil Nanavati [Sun, 4 May 2014 00:12:15 +0000 (17:12 -0700)]
Temporarily fix test suite to swap arguments until code from AOSP is merged in.
Change-Id: I5d8e56f7581df9bcefc8c46518835cac588f47df
Sharvil Nanavati [Thu, 10 Apr 2014 05:20:40 +0000 (22:20 -0700)]
Initial import of HAL-layer tests for bluedroid.
The test cases are in cases/, the support infrastructure for the
tests are in support/. Initially, as new test cases are being added
for different functional areas (e.g. BT socket) we'll need to also
write support functions to make those tests easier to write.
Over time, however, the support functions will be complete enough
that writing additional tests won't require also writing support
routines.
Change-Id: I54abb1011ca5132834a334cc256e3ff18cc20cbb
Hemant Gupta [Fri, 18 Apr 2014 09:34:43 +0000 (15:04 +0530)]
GAP: Avoiding two disconnections from DUT
Avoid sending two hci disconnect commandss from DUT when remote
initiated connection fails when user presses cancel for incoming
pairing request.
Change-Id: Idd05ffbcaac427515a54216adcdd7dbe26cb21c8
Hemant Gupta [Mon, 6 Jan 2014 08:58:28 +0000 (14:28 +0530)]
GAP: Update local device name immediately
Though the function btif_config_set_str requests to
save device name immediately, sometimes it doesn't
call save device name if the cached changes are more.
So calling the "btif_config_save" explicitly to avoid
failure cases.
Change-Id: I9fb05caf284d6a6feb906f87a4db19896182d2c9
Ganesh Ganapathi Batta [Mon, 28 Apr 2014 23:21:04 +0000 (16:21 -0700)]
Fix Null pointer access in GKI timer library
Change-Id: Iada2d426fe4592416eed988202c14599656b33e4
Ganesh Ganapathi Batta [Wed, 16 Apr 2014 23:50:09 +0000 (16:50 -0700)]
Merge BT 4.1 features
The features include:
- LE Peripheral Mode
- Link Layer topology (LE Central & Peripheral Concurrency)
- Dual Mode Topology (Ability to choose LE transport when connecting with
other Dual Mode devices)
- Fast advertising Interval
- Limited Discovery Time Changes
- GAP Authentication and Lost Bond
- Dual Mode Addressing
- Common Profile and Service Error Code
- 32 bit UUIDs
Change-Id: Ic6701da4cf6aaa390ff2c8816b43157f36b7fb42
Conflicts:
stack/btu/btu_hcif.c
Ganesh Ganapathi Batta [Wed, 30 Apr 2014 00:32:14 +0000 (17:32 -0700)]
fix random crashes in bd2str caused by exceeding string array
remove all casts to avoid sign extension of bd address as this may
exceed the size of destination str buffer
Change-Id: I27dc7e61b52440c6b284b7e9931e6daa66afbf12
Zhihai Xu [Tue, 29 Apr 2014 23:08:48 +0000 (16:08 -0700)]
fix compilation error due to not include correct header
Change-Id: Ic4c1fb319f9c4202efd108d180f438a6fa26e05a