OSDN Git Service
Satya Calloji [Sat, 28 Jun 2014 06:47:39 +0000 (06:47 +0000)]
am
aef4bd1c: Address allocation scheme for multiple advertisers
* commit '
aef4bd1ced9208ae4b1d1975a2734dc82eaf838d':
Address allocation scheme for multiple advertisers
Prerepa Viswanadham [Sat, 28 Jun 2014 06:47:39 +0000 (06:47 +0000)]
am
0c4ec0da: Fix build for aosp_manta
* commit '
0c4ec0dae97523cadc9207e98c4a1edff7e2e7cf':
Fix build for aosp_manta
Chris Manton [Sat, 28 Jun 2014 06:47:38 +0000 (06:47 +0000)]
am
167686c8: Remove dead timer code from btu
* commit '
167686c80108ed5cf030631057ec82dc169f3e65':
Remove dead timer code from btu
Mike Lockwood [Sat, 28 Jun 2014 06:47:37 +0000 (06:47 +0000)]
am
d0bc2154: Fix build breakage due to bad rebase
* commit '
d0bc21547cde6bbd8ef9139d2b8b9fb2b300ba8f':
Fix build breakage due to bad rebase
Mike Lockwood [Sat, 28 Jun 2014 06:47:37 +0000 (06:47 +0000)]
am
b48d176a: Fix garbage left in makefile
* commit '
b48d176a454377e02c6ae0e014746c0b28d6577c':
Fix garbage left in makefile
Mike Lockwood [Sat, 28 Jun 2014 06:47:36 +0000 (06:47 +0000)]
am
3a1ca50d: Move AVRCP controller support to separate HAL interface
* commit '
3a1ca50d0def4078a0db82bcdeecfe408ca4af64':
Move AVRCP controller support to separate HAL interface
Mike Lockwood [Sat, 28 Jun 2014 06:47:35 +0000 (06:47 +0000)]
am
30924375: (-s ours) More work on A2DP Sink:
* commit '
309243751678f395e6f7323e45433e5476dc17ef':
More work on A2DP Sink:
Hemant Gupta [Sat, 28 Jun 2014 06:42:25 +0000 (06:42 +0000)]
am
8e08ad12: (-s ours) SBC Decoder for A2DP SINK
* commit '
8e08ad12eae66877f9725ca2d66fc69fe6762340':
SBC Decoder for A2DP SINK
Hemant Gupta [Sat, 28 Jun 2014 06:37:15 +0000 (06:37 +0000)]
am
cc355591: (-s ours) Add A2DP Sink Support
* commit '
cc35559160745c60b42ae182002a59337d844d09':
Add A2DP Sink Support
Matthew Xie [Sat, 28 Jun 2014 06:33:05 +0000 (23:33 -0700)]
resolved conflicts for merge of
6449e497 to master
Change-Id: I01ef7ea6c4ce49c9d775b355fb5b082b25ffbc39
Matthew Xie [Sat, 28 Jun 2014 06:23:06 +0000 (23:23 -0700)]
resolved conflicts for merge of
e01b1126 to master
Change-Id: I7a7b069b1a5f75205e540a578c17a2633e8df18e
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:13 +0000 (05:07 +0000)]
am
82d0a118: Eliminate dead code: remove GKI_sched* from the codebase.
* commit '
82d0a118de082b95cc41b63de8fcd79c9f1f0831':
Eliminate dead code: remove GKI_sched* from the codebase.
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:12 +0000 (05:07 +0000)]
am
479a9a37: Parse auto_pair_devlist.conf file with the generic config parser.
* commit '
479a9a3750e243b40663ddbd1ac44d4fc1c3ec4e':
Parse auto_pair_devlist.conf file with the generic config parser.
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:12 +0000 (05:07 +0000)]
am
c0048149: Fix build: BTM_BleLocalPrivacyEnabled is called from outside BLE_PRIVACY_SPT guard.
* commit '
c0048149c344473218f746f435dc2ab4181e689d':
Fix build: BTM_BleLocalPrivacyEnabled is called from outside BLE_PRIVACY_SPT guard.
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:11 +0000 (05:07 +0000)]
am
88e76456: Disable BLE address randomization since it causes excessive timer wakeups.
* commit '
88e76456c4e4a641b4d4ddad9e7c0a9ee2418e6b':
Disable BLE address randomization since it causes excessive timer wakeups.
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:11 +0000 (05:07 +0000)]
am
9bce2266: Implement GKI timers based on wake alarms and wake locks.
* commit '
9bce2266bae83dfeb57319076dee569324a6d0a8':
Implement GKI timers based on wake alarms and wake locks.
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:10 +0000 (05:07 +0000)]
am
611f3abf: Allow btsnoop logs to be read over a local socket.
* commit '
611f3abf1c12a9f568114e46a21e70c74eaf6a60':
Allow btsnoop logs to be read over a local socket.
Wei Wang [Sat, 28 Jun 2014 05:07:09 +0000 (05:07 +0000)]
am
eb4fa4a5: Merge "Changed the status check for BleObserve" into klp-wireless-dev
* commit '
eb4fa4a5049f85b32642c49c3f9d88f07413d525':
Changed the status check for BleObserve
Nitin Arora [Sat, 28 Jun 2014 05:07:08 +0000 (05:07 +0000)]
am
b8cb9576: Bluetooth: Assign max adv instance value from vendor capabilities
* commit '
b8cb95764ddfbed821ba03d3f24b53ac913f7cc3':
Bluetooth: Assign max adv instance value from vendor capabilities
Matthew Xie [Sat, 28 Jun 2014 05:07:07 +0000 (05:07 +0000)]
am
bf611504: Merge "Save remote device name immediately" into klp-wireless-dev
* commit '
bf611504d460adb10cc8c31f731504750104a1f3':
Save remote device name immediately
Sharvil Nanavati [Sat, 28 Jun 2014 05:07:07 +0000 (05:07 +0000)]
am
970f914b: Rename UNUSED to UNUSED_ATTR in OSI due to symbol collision.
* commit '
970f914bcf0344724337a1a86672e9a866945d6c':
Rename UNUSED to UNUSED_ATTR in OSI due to symbol collision.
Ganesh Ganapathi Batta [Sat, 28 Jun 2014 05:07:07 +0000 (05:07 +0000)]
am
9546abf9: (-s ours) Support for reading LE specific controller features
* commit '
9546abf9fc4400853803ee220482ae63e63f0d9d':
Support for reading LE specific controller features
Sharvil Nanavati [Sat, 28 Jun 2014 05:01:52 +0000 (05:01 +0000)]
am
83c5256f: (-s ours) Logging cleanup: HCI and BTM trace macros.
* commit '
83c5256f1951db020d81412e1d595d7a37962f3e':
Logging cleanup: HCI and BTM trace macros.
Sharvil Nanavati [Sat, 28 Jun 2014 04:56:01 +0000 (04:56 +0000)]
am
f1d9b90f: Whitelist IPv6 packets so they can be sent over PAN.
* commit '
f1d9b90f44336264a7dfee8708f208cd7b7fd541':
Whitelist IPv6 packets so they can be sent over PAN.
Sharvil Nanavati [Sat, 28 Jun 2014 04:56:01 +0000 (04:56 +0000)]
am
54645652: Use an event file descriptor instead of a pipe to control userial.
* commit '
5464565299174b9d7ab4b2743ba77b3a78a5a043':
Use an event file descriptor instead of a pipe to control userial.
Sharvil Nanavati [Sat, 28 Jun 2014 04:56:01 +0000 (04:56 +0000)]
am
fa52a07c: Use the generic config parser to parse bt_stack.conf.
* commit '
fa52a07c97235f912ccf98985973ca539f9dce92':
Use the generic config parser to parse bt_stack.conf.
Sharvil Nanavati [Sat, 28 Jun 2014 04:56:00 +0000 (04:56 +0000)]
am
f8867738: Add a generic config parser for the INI file format.
* commit '
f886773891f1cfe37f8824ed8e63230954e5c2d8':
Add a generic config parser for the INI file format.
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