OSDN Git Service
Sharvil Nanavati [Sat, 28 Jun 2014 04:55:59 +0000 (04:55 +0000)]
am
02124878: (-s ours) Start cleaning up log macros.
* commit '
0212487880be33e255d49f6e38dbb035d1f77750':
Start cleaning up log macros.
Sharvil Nanavati [Sat, 28 Jun 2014 04:49:51 +0000 (04:49 +0000)]
am
64d7ee67: Add a couple more tests for list.
* commit '
64d7ee67b118de5c8a7fe362ef27b48c525f57a8':
Add a couple more tests for list.
Sharvil Nanavati [Sat, 28 Jun 2014 04:49:50 +0000 (04:49 +0000)]
am
c11b407e: (-s ours) Implement a fixed queue.
* commit '
c11b407e78d96e05b0991bbe6dfde0d7eb5349b5':
Implement a fixed queue.
Nitin Arora [Sat, 28 Jun 2014 04:44:36 +0000 (04:44 +0000)]
am
fa994c9b: (-s ours) Bluetooth: Changes to enable features on KWD
* commit '
fa994c9b7d63d381e33a5d63a7c97ae3edf4dc0f':
Bluetooth: Changes to enable features on KWD
Hemant Gupta [Sat, 28 Jun 2014 04:39:27 +0000 (04:39 +0000)]
am
44c6f8d6: (-s ours) [2/4] Add Support for AVRCP Controller Feature
* commit '
44c6f8d6c7cb3929a5b49e5d0ef8c471798f552f':
[2/4] Add Support for AVRCP Controller Feature
Matthew Xie [Sat, 28 Jun 2014 04:33:28 +0000 (04:33 +0000)]
Merge "pan_control_state_changed arggument order is not right"
Matthew Xie [Sat, 28 Jun 2014 04:32:11 +0000 (21:32 -0700)]
pan_control_state_changed arggument order is not right
Change-Id: I2df8022c8bbba3d524572926785cc39530e7a04c
Wei Wang [Sat, 28 Jun 2014 04:30:15 +0000 (04:30 +0000)]
am
bf0e4b26: Fix build issue for devices without BLE features.
* commit '
bf0e4b26d8f0748ff4f9522a2ac7001bfb9ca5cc':
Fix build issue for devices without BLE features.
Satya Calloji [Sat, 28 Jun 2014 04:30:15 +0000 (04:30 +0000)]
am
0943c10e: (-s ours) LE: Add RRA offloading and vendor specific PCF commands
* commit '
0943c10ed5713a08659f08e39e13de4894aaba61':
LE: Add RRA offloading and vendor specific PCF commands
Satya Calloji [Sat, 28 Jun 2014 04:25:04 +0000 (04:25 +0000)]
am
ffb3960b: (-s ours) LE Multi ADV feature
* commit '
ffb3960bb05f9acb0717d213612403487e9ad433':
LE Multi ADV feature
Mike Lockwood [Sat, 28 Jun 2014 04:19:51 +0000 (04:19 +0000)]
am
bfa5cf78: (-s ours) Merge "[2/4] Bluetooth: Add support for HFP Client role." into klp-wireless-dev
* commit '
bfa5cf78dc26b971236190c6fb42353a8d30a649':
[2/4] Bluetooth: Add support for HFP Client role.
Mike Lockwood [Sat, 28 Jun 2014 04:12:21 +0000 (04:12 +0000)]
am
4a1a92a5: (-s ours) Merge "Submitted on behalf of 3rd party copied from external/bluetooth/bluedroid" into klp-wireless-dev
* commit '
4a1a92a5f945ecbadc8a8c95ba18cca2c396c26a':
Submitted on behalf of 3rd party copied from external/bluetooth/bluedroid
Prerepa Viswanadham [Sat, 28 Jun 2014 03:43:09 +0000 (03:43 +0000)]
am
714078d9: (-s ours) LE: Add API to set scan interval and window (2/4) Delete client_if from scan api\'s Change-Id: I66e0e17221601cd07ea77cf3d61ad9ce20a603a4
* commit '
714078d91aa0ecbe29661aac869dc397d8884042':
LE: Add API to set scan interval and window (2/4) Delete client_if from scan api's Change-Id: I66e0e17221601cd07ea77cf3d61ad9ce20a603a4
Zhihai Xu [Sat, 28 Jun 2014 03:37:59 +0000 (03:37 +0000)]
am
2e06f006: Unable to pair and connect A2DP headset with DUT on KWD
* commit '
2e06f006d2e403b43f3b10016b14d5591807e67b':
Unable to pair and connect A2DP headset with DUT on KWD
Sharvil Nanavati [Sat, 28 Jun 2014 03:37:59 +0000 (03:37 +0000)]
am
c4e0e049: (-s ours) Clean up the public functions in userial.c.
* commit '
c4e0e049e27622f01e93a4ac6beaec60d72d2364':
Clean up the public functions in userial.c.
Sharvil Nanavati [Sat, 28 Jun 2014 03:32:50 +0000 (03:32 +0000)]
am
740def52: (-s ours) Eliminate dead code (helped by compiler warnings).
* commit '
740def526e757f5ea8f30d9d28d1e7a668dadc42':
Eliminate dead code (helped by compiler warnings).
Sharvil Nanavati [Sat, 28 Jun 2014 03:27:41 +0000 (03:27 +0000)]
am
10266fda: Fix data type for rmt_auth_req; it stores an integral value.
* commit '
10266fdad65bb8e378d2fa49de8e1368a91d7270':
Fix data type for rmt_auth_req; it stores an integral value.
Sharvil Nanavati [Sat, 28 Jun 2014 03:27:40 +0000 (03:27 +0000)]
am
1671598d: (-s ours) Minor cleanup of userial code.
* commit '
1671598d31090ad045f2ca982fbb0a7d486521f3':
Minor cleanup of userial code.
Sharvil Nanavati [Sat, 28 Jun 2014 03:22:31 +0000 (03:22 +0000)]
am
d9e5b349: (-s ours) Update RFCOMM socket code to use list data structure.
* commit '
d9e5b3490bf41f912823af920cc616e57e0fec28':
Update RFCOMM socket code to use list data structure.
Sharvil Nanavati [Sat, 28 Jun 2014 03:17:22 +0000 (03:17 +0000)]
am
3542d5a9: (-s ours) Update btif_profile_queue to use the list data structure.
* commit '
3542d5a93129b6a8026501f87877017173530ae0':
Update btif_profile_queue to use the list data structure.
Sharvil Nanavati [Sat, 28 Jun 2014 03:12:14 +0000 (03:12 +0000)]
am
cef7695c: (-s ours) Add a singly linked list implementation for OSI.
* commit '
cef7695cb3c0e1a5d462deac6508ade2726918cf':
Add a singly linked list implementation for OSI.
Hemant Gupta [Sat, 28 Jun 2014 03:07:04 +0000 (03:07 +0000)]
am
7e4c60ce: Bluetooth: On Suspend ignore media task timer event
* commit '
7e4c60ce7757d935901f53d1f21ecc696aa89979':
Bluetooth: On Suspend ignore media task timer event
Hemant Gupta [Sat, 28 Jun 2014 03:07:03 +0000 (03:07 +0000)]
am
0ab408fe: HID: Send Close event to upper layers during reconnection
* commit '
0ab408fe6f6cb698ba1fcd8492d117c0d3574c7d':
HID: Send Close event to upper layers during reconnection
Hemant Gupta [Sat, 28 Jun 2014 03:07:03 +0000 (03:07 +0000)]
am
ca7f48cd: GAP: Return BTM_CMD_STARTED from btm_sec_l2cap_access_req
* commit '
ca7f48cd6e94d29150d7d7a2d7918f9b50b99b7e':
GAP: Return BTM_CMD_STARTED from btm_sec_l2cap_access_req
Hemant Gupta [Sat, 28 Jun 2014 03:07:02 +0000 (03:07 +0000)]
am
4974d81a: MHF: Route call to correct HS in multi call scenario.
* commit '
4974d81a88dd7ffa1951242dfc830d329f3cf378':
MHF: Route call to correct HS in multi call scenario.
Matthew Xie [Sat, 28 Jun 2014 03:07:02 +0000 (03:07 +0000)]
am
d8e742ff: Merge "fix random crashes in bd2str caused by exceeding string array" into klp-wireless-dev
* commit '
d8e742ff26096ed599623285047aca39b9e7a87a':
fix random crashes in bd2str caused by exceeding string array
Ganesh Ganapathi Batta [Sat, 28 Jun 2014 03:07:01 +0000 (03:07 +0000)]
am
a217ab9a: Resolve Pairing failure with IPhone
* commit '
a217ab9a0294a8285641b141efccf7d54b437a33':
Resolve Pairing failure with IPhone
Sharvil Nanavati [Sat, 28 Jun 2014 03:07:01 +0000 (03:07 +0000)]
am
b6a91283: Temporarily fix test suite to swap arguments until code from AOSP is merged in.
* commit '
b6a912833c68aec96222c1db65880b23be88aa44':
Temporarily fix test suite to swap arguments until code from AOSP is merged in.
Sharvil Nanavati [Sat, 28 Jun 2014 03:07:00 +0000 (03:07 +0000)]
am
2a73b6de: (-s ours) Initial import of HAL-layer tests for bluedroid.
* commit '
2a73b6deaaf2c12dec215ddeab1e0223c9f28446':
Initial import of HAL-layer tests for bluedroid.
Matthew Xie [Sat, 28 Jun 2014 03:01:52 +0000 (03:01 +0000)]
am
9a53b055: Merge "Fix Null pointer access in GKI timer library" into klp-wireless-dev
* commit '
9a53b0554670bbd035b07dcc497ef00273599ed2':
Fix Null pointer access in GKI timer library
Matthew Xie [Sat, 28 Jun 2014 03:01:51 +0000 (03:01 +0000)]
am
2a55a6e1: Merge "Fix issue of HDP select thread not exiting during BT OFF" into klp-wireless-dev
* commit '
2a55a6e1955be41227ebe850090c925867d9b98b':
Fix issue of HDP select thread not exiting during BT OFF
Hemant Gupta [Sat, 28 Jun 2014 03:01:51 +0000 (03:01 +0000)]
am
19221011: GAP: Avoiding two disconnections from DUT
* commit '
19221011da89713c8b360e39953327c8cd920b6c':
GAP: Avoiding two disconnections from DUT
Hemant Gupta [Sat, 28 Jun 2014 03:01:50 +0000 (03:01 +0000)]
am
fbf76881: GAP: Update local device name immediately
* commit '
fbf76881316471faf631dc543089efaeaf72df8d':
GAP: Update local device name immediately
Ganesh Ganapathi Batta [Sat, 28 Jun 2014 03:01:50 +0000 (03:01 +0000)]
am
8fe58875: (-s ours) Merge BT 4.1 features
* commit '
8fe58875ce67c6e1099e7ba2339dcd2b979491b0':
Merge BT 4.1 features
Zhihai Xu [Sat, 28 Jun 2014 02:56:40 +0000 (02:56 +0000)]
am
ffa5c93d: fix compilation error due to not include correct header
* commit '
ffa5c93d455f33af1be3b04d39520413dc24afd5':
fix compilation error due to not include correct header
Nitin Srivastava [Sat, 28 Jun 2014 02:56:40 +0000 (02:56 +0000)]
am
2cb90bc5: (-s ours) Add support for Multi-HFP devices
* commit '
2cb90bc58fc075ec2f814ada5ae8f728380566c1':
Add support for Multi-HFP devices
Nitin Srivastava [Sat, 28 Jun 2014 02:51:32 +0000 (02:51 +0000)]
am
ad0b6c78: (-s ours) Bluetooth: Clear Notification array on AVRCP disconnect
* commit '
ad0b6c784a5684812f828b68fd8b5f952c62a443':
Bluetooth: Clear Notification array on AVRCP disconnect
Nitin Srivastava [Sat, 28 Jun 2014 02:46:23 +0000 (02:46 +0000)]
am
04670cfc: (-s ours) Set out stream to null if control socket fails to connect
* commit '
04670cfc541801d645309759e6624e0275fc2e5d':
Set out stream to null if control socket fails to connect
Nitin Srivastav [Sat, 28 Jun 2014 02:41:10 +0000 (02:41 +0000)]
am
d24ece6a: (-s ours) Bluetooth: retry recv in case of EINTR
* commit '
d24ece6ababf67bdc109a25c275e8b0d491a9976':
Bluetooth: retry recv in case of EINTR
Zhihai Xu [Sat, 28 Jun 2014 02:36:00 +0000 (02:36 +0000)]
am
a7ea8099: Bluetooth: GAP: Remove bonded device info on Authentication fail
* commit '
a7ea809912e5a945d657957491753260826422f4':
Bluetooth: GAP: Remove bonded device info on Authentication fail
Sharvil Nanavati [Sat, 28 Jun 2014 02:35:58 +0000 (02:35 +0000)]
am
2e1e6d89: (-s ours) Use standard C99 integral types. This offers better type safety.
* commit '
2e1e6d89907172fadabc5d9bbef27198ce81cb00':
Use standard C99 integral types. This offers better type safety.
Zhihai Xu [Sat, 28 Jun 2014 02:30:49 +0000 (02:30 +0000)]
am
7c540400: Increasing the SDP_MTU_SIZE from 256 to the default 672 bytes
* commit '
7c540400e5b9d8ce461a9cb41d76d83264e04e2e':
Increasing the SDP_MTU_SIZE from 256 to the default 672 bytes
Zhihai Xu [Sat, 28 Jun 2014 02:30:48 +0000 (02:30 +0000)]
am
45b4fafd: a2dp audio HAL: use correct interface version
* commit '
45b4fafdafec1de92f98d82a3e9288eaef6c60c2':
a2dp audio HAL: use correct interface version
Zhihai Xu [Sat, 28 Jun 2014 02:30:48 +0000 (02:30 +0000)]
am
f96da0ee: (-s ours) Allow simultaneous LE Observe and BTM Inquiry/Scan
* commit '
f96da0ee19d8eb9d159b965338bdd15d327cb474':
Allow simultaneous LE Observe and BTM Inquiry/Scan
Zhihai Xu [Sat, 28 Jun 2014 02:01:29 +0000 (02:01 +0000)]
am
3a55ec21: SDP: Allocate proper sized scratch buffer for SDP response
* commit '
3a55ec216948d28224d3ab0d38fb8697daeed3e5':
SDP: Allocate proper sized scratch buffer for SDP response
Zhihai Xu [Sat, 28 Jun 2014 02:01:28 +0000 (02:01 +0000)]
am
73e68297: flounder64: bluetooth: Adjust volume level on BT HS and DUT side
* commit '
73e68297292dd901a170bcf6434ed0a10f1ec450':
flounder64: bluetooth: Adjust volume level on BT HS and DUT side
Zhihai Xu [Sat, 28 Jun 2014 02:01:28 +0000 (02:01 +0000)]
am
ad3fc6e3: (-s ours) audio: fix set_parameters return value.
* commit '
ad3fc6e30f49d78ef4dfd968b0747c62563b7a79':
audio: fix set_parameters return value.
Hemant Gupta [Sat, 28 Jun 2014 01:56:19 +0000 (01:56 +0000)]
am
79eb1a64: HID: Use dynamic memory while sending data
* commit '
79eb1a643a2e627e5fb2c9dae1cb6a56a15ff0cf':
HID: Use dynamic memory while sending data
Hemant Gupta [Sat, 28 Jun 2014 01:56:19 +0000 (01:56 +0000)]
am
fbaeb4a7: HID: Parse paired hid devices from bluez.
* commit '
fbaeb4a7b64a89c08a98b53766e250eb7bad8830':
HID: Parse paired hid devices from bluez.
Hemant Gupta [Sat, 28 Jun 2014 01:56:18 +0000 (01:56 +0000)]
am
87b7cce1: GAP: Try to retrieve CoD from NVRAM if 0
* commit '
87b7cce18f64b1b5f1cdff81d883a5c8720ead77':
GAP: Try to retrieve CoD from NVRAM if 0
Hemant Gupta [Sat, 28 Jun 2014 01:56:18 +0000 (01:56 +0000)]
am
8f322bfe: HID: Reset Disconnect Reason on Connection Establishment
* commit '
8f322bfe42a57902e7c45713a5c6215dfbe2494a':
HID: Reset Disconnect Reason on Connection Establishment
Zhihai Xu [Sat, 28 Jun 2014 01:56:17 +0000 (01:56 +0000)]
am
8d2128d5: HID: Remove device from nvram on auth failure
* commit '
8d2128d5740c8a7282e2336cd9f5901e98d3eb63':
HID: Remove device from nvram on auth failure
Zhihai Xu [Sat, 28 Jun 2014 01:56:17 +0000 (01:56 +0000)]
am
45c71b06: HID: Use dynamic memory while sending report
* commit '
45c71b0647cba0f199a8dfd1321c1b59a916cfe5':
HID: Use dynamic memory while sending report
Hemant Gupta [Sat, 28 Jun 2014 01:56:16 +0000 (01:56 +0000)]
am
bf51271f: HID: Serialize L2CAP disconnection
* commit '
bf51271f145204a0489597ccd9c851daa7ee0ad7':
HID: Serialize L2CAP disconnection
Hemant Gupta [Sat, 28 Jun 2014 01:56:16 +0000 (01:56 +0000)]
am
742d9fa5: HID: Handle connection failure in disconnecting state
* commit '
742d9fa575cd1ea12c7d4413f1bec62863b07cab':
HID: Handle connection failure in disconnecting state
Hemant Gupta [Sat, 28 Jun 2014 01:56:15 +0000 (01:56 +0000)]
am
1747956b: HID: Reset Idle timeout to 0 while hid disconnection
* commit '
1747956ba052b1538c29fe7793403dc4f13ba525':
HID: Reset Idle timeout to 0 while hid disconnection
Zhihai Xu [Sat, 28 Jun 2014 01:56:14 +0000 (01:56 +0000)]
am
c1ebd4da: Merge "HID: Fix memory leak in HID Code" into klp-wireless-dev
* commit '
c1ebd4dafecc47ce2964ff2a82cb6e7f3fd1179f':
HID: Fix memory leak in HID Code
Zhihai Xu [Sat, 28 Jun 2014 01:56:13 +0000 (01:56 +0000)]
am
c64a7a58: Merge "HID: Establish Interrupt Channel when Control channel is configured" into klp-wireless-dev
* commit '
c64a7a58c2b4c3ad525a01647a3284c22d43e8a8':
HID: Establish Interrupt Channel when Control channel is configured
Hemant Gupta [Sat, 28 Jun 2014 01:56:12 +0000 (01:56 +0000)]
am
7a25994c: HID: Reduce poll time to 50 ms for polling from uhid driver
* commit '
7a25994c7b99c02a8d9e3bd258767c1bdeb84f50':
HID: Reduce poll time to 50 ms for polling from uhid driver
Hemant Gupta [Sat, 28 Jun 2014 01:56:11 +0000 (01:56 +0000)]
am
4c5f9ef5: HID: Update SSR parameters during copy.
* commit '
4c5f9ef5fa88891f073b38d5e15f2705ed5c235e':
HID: Update SSR parameters during copy.
Zhihai Xu [Sat, 28 Jun 2014 01:56:10 +0000 (01:56 +0000)]
am
496765df: (-s ours) Merge "Fix GKI exception of calling free on an already freed buffer" into klp-wireless-dev
* commit '
496765df63a103d46aff536f9e1c094bf58d52b7':
Fix GKI exception of calling free on an already freed buffer
Zhihai Xu [Sat, 28 Jun 2014 01:50:55 +0000 (01:50 +0000)]
am
17888ed7: Merge "bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db" into klp-wireless-dev
* commit '
17888ed7fa01bf266e3847b308f4091fd93f719c':
bluetooth: hid: store ssr_max_latency and ssr_min_tout in bonding db
Sharvil Nanavati [Sat, 28 Jun 2014 01:50:55 +0000 (01:50 +0000)]
am
f4b8f8aa: (-s ours) Add flow control for PAN.
* commit '
f4b8f8aa313d3b7d88b683bfe0e5f9eb0a29b3b3':
Add flow control for PAN.
Wei Wang [Sat, 28 Jun 2014 01:45:47 +0000 (01:45 +0000)]
am
7f5fe664: Fixed a build warning.
* commit '
7f5fe66421eadb136e3ea9b6af8f6e4ac8725f64':
Fixed a build warning.
Wei Wang [Sat, 28 Jun 2014 01:45:46 +0000 (01:45 +0000)]
am
cd50ccd7: (-s ours) Merge "LE: Add controller based advertising filter API (2/2)" into klp-wireless-dev
* commit '
cd50ccd7abeddd368badc6ace8fe45020fecaf3b':
LE: Add controller based advertising filter API (2/2)
Matthew Xie [Sat, 28 Jun 2014 00:57:45 +0000 (17:57 -0700)]
resolved conflicts for merge of
6dae552e to master
Change-Id: Iec7a5f2c72d1b54798a50de077c9f74317413b90
Sharvil Nanavati [Sat, 28 Jun 2014 00:53:29 +0000 (00:53 +0000)]
am
2d5d56ea: Rewrite PAN_Write in terms of PAN_WriteBuf.
* commit '
2d5d56ead7d9dd811cf9c5ef26b16c4a0b149ade':
Rewrite PAN_Write in terms of PAN_WriteBuf.
Matthew Xie [Sat, 28 Jun 2014 00:51:40 +0000 (17:51 -0700)]
resolved conflicts for merge of
5c42abe7 to master
Change-Id: I71ad8ed50fc6025282d3eeff50323d9b43fa20d4
Matthew Xie [Sat, 28 Jun 2014 00:47:19 +0000 (00:47 +0000)]
am
fd2e0f21: Merge "Bluetooth: GAP: Send bond none in case of temp pairing" into klp-wireless-dev
* commit '
fd2e0f21623a8e38460c140281500ea1f658f422':
Bluetooth: GAP: Send bond none in case of temp pairing
Matthew Xie [Sat, 28 Jun 2014 00:46:25 +0000 (17:46 -0700)]
resolved conflicts for merge of
6d4a9e9c to master
Change-Id: I8392aa953c01f88a53365d551e0a35397ff981a1
Matthew Xie [Sat, 28 Jun 2014 00:27:42 +0000 (17:27 -0700)]
resolved conflicts for merge of
3aafefbb to master
Change-Id: If6eef0a894b32b8574ecd59409bf1cab62e1e42c
Zhihai Xu [Sat, 28 Jun 2014 00:24:05 +0000 (00:24 +0000)]
am
add314d5: Merge "open GATT client didn\'t reserve the BLE link if open after connected." into klp-wireless-dev
* commit '
add314d5fcffc2ac2c7fb8b64a67d4da6d5a0cdd':
open GATT client didn't reserve the BLE link if open after connected.
Matthew Xie [Sat, 28 Jun 2014 00:21:41 +0000 (17:21 -0700)]
resolved conflicts for merge of
d0f17781 to master
Change-Id: Ie2b14ea2b314e8af34c0fc73fbce1ee2f7de55fa
Matthew Xie [Sat, 28 Jun 2014 00:09:54 +0000 (17:09 -0700)]
resolved conflicts for merge of
51356020 to master
Change-Id: I80533874e7b34989722dc0eebc2d4dd59d906e4e
Zhihai Xu [Sat, 28 Jun 2014 00:01:46 +0000 (00:01 +0000)]
am
7fc4503f: Merge "print MTU size after get MTU request from iphone." into klp-wireless-dev
* commit '
7fc4503f4957e0ab6f5b59640594a2d844336caa':
print MTU size after get MTU request from iphone.
Matthew Xie [Fri, 27 Jun 2014 23:59:13 +0000 (16:59 -0700)]
resolved conflicts for merge of
936531f8 to master
Change-Id: If1c78b1db654335df7dd9a495de1a54637a862e1
Andre Eisenbach [Fri, 27 Jun 2014 19:23:08 +0000 (19:23 +0000)]
Merge "LE: Use write_request to set HOGP descriptors"
Andre Eisenbach [Fri, 27 Jun 2014 17:54:19 +0000 (17:54 +0000)]
Merge "LE: Add notification sent and congestion callbacks (2/4)"
Mike Lockwood [Thu, 26 Jun 2014 18:08:24 +0000 (11:08 -0700)]
Merge some missing pieces of AVRCP controller support from klp-wireless-dev
Change-Id: I1dc99496a6ed0e7d13cab9d7c95972d32ad88769
Nitin Arora [Fri, 15 Nov 2013 20:43:02 +0000 (12:43 -0800)]
LE: Use write_request to set HOGP descriptors
Use the write_request operation (instead of write_command) to set HOGP
descriptors in accordance with the Bluetooth spec.
Change-Id: I4c18f2cb727a7aabddaa5c965b29eca78843fc7a
Mike J. Chen [Thu, 26 Jun 2014 17:38:19 +0000 (17:38 +0000)]
Merge "Fix a comment typo"
Mike J. Chen [Thu, 26 Jun 2014 17:38:13 +0000 (17:38 +0000)]
Merge "Use HCI_TRACE instead of BT_TRACE macros"
Mike J. Chen [Thu, 26 Jun 2014 17:38:05 +0000 (17:38 +0000)]
Merge "Change btif_gatt_client to use BTIF_TRACE_XXX macros instead of raw ALOGX"
Andre Eisenbach [Thu, 26 Jun 2014 17:34:24 +0000 (17:34 +0000)]
Merge "Fix bug with get report completion due to uninitialized structure"
Steve Paik [Thu, 19 Jun 2014 22:50:46 +0000 (15:50 -0700)]
[bluedroid] Fix slave latency and conn timeout defaults in BLE
The default connection parameters were not being applied properly in BLE.
Also fixed a typo in btm_ble.c.
Change-Id: I6cfb0f2a400740578910dcf4c7192ea16406aa1b
Signed-off-by: Steve Paik <spaik@google.com>
Mike J. Chen [Wed, 25 Jun 2014 20:09:01 +0000 (13:09 -0700)]
Fix a comment typo
Change-Id: I5df71f04b4d4752c782937344ec110813aff8915
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Thu, 26 Jun 2014 01:12:22 +0000 (18:12 -0700)]
Use HCI_TRACE instead of BT_TRACE macros
This allows enabling/disabling to be controlled by the HCI_INITIAL_TRACE_LEVEL
in bt_trace.h instead of unconditionally tracing.
Change-Id: Iacbc8b3e8daefb665230d0c10ba4111b9b4576a7
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Thu, 26 Jun 2014 01:10:32 +0000 (18:10 -0700)]
Change btif_gatt_client to use BTIF_TRACE_XXX macros instead of raw ALOGX
This allows the trace flags in bt_trace.h to control whether these
logs are enabled or not, to be consistent with rest of bluedroid.
Change-Id: Ia4abeac42da181fd748a668d3ec5a9624ae8c19d
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Thu, 26 Jun 2014 01:07:03 +0000 (18:07 -0700)]
Fix bug with get report completion due to uninitialized structure
When LE has received a get report response, it needs to create
a packet to send to the btif_hh_upstreams_evt() handler that
does callback invocation. The packet it allocated was
not fully initialized. Specifically, the offset field was not
set, which is used by btif_hh_upstreams_evt() to figure out
where in the data buffer the start of the returned data is.
The uninitialized offset causes garbage to be returned for
anyone using GetReport/SetReport APIs on an LE device.
Change-Id: I4644cd8d6d38308c35b50f99139306a77200d7cd
Signed-off-by: Mike J. Chen <mjchen@google.com>
Andre Eisenbach [Fri, 28 Mar 2014 21:54:22 +0000 (14:54 -0700)]
LE: Add notification sent and congestion callbacks (2/4)
This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.
Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.
Also fixes a memory leak issue that can trigger GKI exception for
certain GATT operations.
Change-Id: Ib470c15ca1f577573a632e9afe4cb9e86680fd8c
Matthew Xie [Sun, 22 Jun 2014 21:12:58 +0000 (21:12 +0000)]
Merge "switch a2dp sync and source to the correct uuids"
Matthew Xie [Sun, 22 Jun 2014 20:32:05 +0000 (13:32 -0700)]
switch a2dp sync and source to the correct uuids
bug
15687722
Change-Id: I09e5fdc7bf7c1bb0ff3c87dc43b228e3761cfa36
Andre Eisenbach [Fri, 20 Jun 2014 22:18:06 +0000 (22:18 +0000)]
Merge "LE: Add is_connected() function (2/3)"
Nick Vaccaro [Fri, 20 Jun 2014 18:05:29 +0000 (11:05 -0700)]
Fix build break for Platina.
Bug:
15143878
Change-Id: I7a0b3aa289b69e7c86fbc8abed151690fb0e8112
Andre Eisenbach [Wed, 18 Jun 2014 19:20:37 +0000 (12:20 -0700)]
LE: Add is_connected() function (2/3)
Change-Id: I73c4ea7f13982bf9c208996f9c749d2dfbe698be
Matthew Xie [Thu, 19 Jun 2014 09:55:03 +0000 (09:55 +0000)]
am
7f781439: am
b72dcbd4: Merge "Bluetooth: Reset Disconnect Reason on Connection Establishment"
* commit '
7f78143933fdd5ac94f3cae65ff02b62eafcc21a':
Bluetooth: Reset Disconnect Reason on Connection Establishment
Matthew Xie [Thu, 19 Jun 2014 09:22:18 +0000 (09:22 +0000)]
am
b72dcbd4: Merge "Bluetooth: Reset Disconnect Reason on Connection Establishment"
* commit '
b72dcbd4acbd064b300be3ac507c45baee2fd690':
Bluetooth: Reset Disconnect Reason on Connection Establishment
Zhihai Xu [Thu, 19 Jun 2014 04:07:34 +0000 (04:07 +0000)]
am
43d8f252: (-s ours) Merge "support peripheral mode feature to connect iphone to android device." into klp-wireless-dev
* commit '
43d8f252240611ad2b67f9587f91058edd9955a0':
support peripheral mode feature to connect iphone to android device.
Zhihai Xu [Wed, 18 Jun 2014 23:56:13 +0000 (23:56 +0000)]
am
c9c88876: Merge "increase the bluetooth task priority when start a2dp." into klp-wireless-dev
* commit '
c9c888765554fa6c5a9a1135b742cab6267d2e54':
increase the bluetooth task priority when start a2dp.
Matthew Xie [Wed, 18 Jun 2014 23:25:34 +0000 (23:25 +0000)]
am
283aa16d: Merge "Bluedroid: Avoid multicast address for tun-tap interface"
* commit '
283aa16d5f16bc10b5491661b5729c5f25635731':
Bluedroid: Avoid multicast address for tun-tap interface