OSDN Git Service
Sharvil Nanavati [Thu, 3 Jul 2014 06:35:53 +0000 (06:35 +0000)]
am
19084c62: Implement the reactor pattern in C.
* commit '
19084c6242d8ddb366a52eba5084c974280cce0f':
Implement the reactor pattern in C.
Sharvil Nanavati [Mon, 23 Jun 2014 23:30:46 +0000 (16:30 -0700)]
Implement the reactor pattern in C.
This code will form the basis of most select-based event loops in
bluedroid. It provides a thread-safe abort routine and a separation
between the dispatcher and event handler code.
Change-Id: I6f1c033d18f045ba273187dab607c209dfe32d30
Wei Wang [Wed, 2 Jul 2014 19:09:15 +0000 (19:09 +0000)]
am
b3c61229: Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev
* commit '
b3c61229ccf38ea3f398f93902d348ba12a7fb07':
Code cleanup - remove unnecessary commented out code
Wei Wang [Wed, 2 Jul 2014 19:05:46 +0000 (19:05 +0000)]
Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev
Wei Wang [Wed, 2 Jul 2014 18:34:08 +0000 (11:34 -0700)]
Code cleanup - remove unnecessary commented out code
Change-Id: I86e78d1b0470b9fda7455ae8ef5788814cf5c780
Matthew Xie [Wed, 2 Jul 2014 07:36:33 +0000 (07:36 +0000)]
am
a92c04f2: (-s ours) DO NOT MERGE Fix compilation issue
* commit '
a92c04f2dbd7f88853d6380d66c1f4d200674f97':
DO NOT MERGE Fix compilation issue
Matthew Xie [Wed, 2 Jul 2014 06:50:46 +0000 (12:20 +0530)]
DO NOT MERGE Fix compilation issue
This patch fixes broken compilation on KWD branch
Change-Id: I9a1da11e33e938910dc556ed3e015bd3456e21ef
Sharvil Nanavati [Wed, 2 Jul 2014 07:13:07 +0000 (00:13 -0700)]
Fix build: change macro call from _DEBUG0 to _DEBUG.
Change-Id: Iacbf4c33a7b690e2065471b85a6a4d82dd4a7fca
Matthew Xie [Wed, 2 Jul 2014 06:29:09 +0000 (06:29 +0000)]
am
23ae7c52: Merge "Added code to reuse the signal fds and avoid fd close" into klp-wireless-dev
* commit '
23ae7c526b529cf1c76c4a4cc8a341545493404d':
Added code to reuse the signal fds and avoid fd close
git-zhenye.broadcom.com [Wed, 2 Jul 2014 06:29:09 +0000 (06:29 +0000)]
am
359895ef: Fixed deadlock issue for concurrent multiple rfcomm connections.
* commit '
359895efb36a7e4f65fbcc9a28221b6ede44aadd':
Fixed deadlock issue for concurrent multiple rfcomm connections.
Sharvil Nanavati [Wed, 2 Jul 2014 00:11:24 +0000 (17:11 -0700)]
Use POSIX timer for non-wake alarms in bluedroid.
After this change, bluedroid will go through AlarmManager for wake
alarms (>= 3s) and POSIX timers + wake lock for short deadlines.
This change allows A2DP to continue streaming while the screen is
off.
Change-Id: I56622a6873aa431842dd1d97e830849ac2fe6773
Sharvil Nanavati [Mon, 30 Jun 2014 01:10:15 +0000 (18:10 -0700)]
Remove more unused code from GKI timers.
Change-Id: I4fc3a64312b49a3dd23d80454244f8eb6340d8e6
Sharvil Nanavati [Mon, 30 Jun 2014 00:36:56 +0000 (17:36 -0700)]
Remove more unused code from GKI.
Specifically:
- ISR code (since bluedroid is entirely userspace)
- logging macros
- newlines in log macros
- GKI_get_time_stamp (unused function)
- GKI_freeze
- unused timer variables and macros
Change-Id: I8e0676c28842d87c4148059ebb0320367658bc16
Mike Lockwood [Wed, 2 Jul 2014 02:21:30 +0000 (19:21 -0700)]
Fix problem with A2DP initialization due to merge error
btif_av_init() would fail when called a second time due to
erroneous nulling of btif_av_cb.sm_handle
Bug:
16014877
Change-Id: I7e6b213759e93372ac8ecaadc2b81452572f3f7d
Matthew Xie [Wed, 2 Jul 2014 06:28:12 +0000 (06:28 +0000)]
Merge "Added code to reuse the signal fds and avoid fd close" into klp-wireless-dev
git-zhenye.broadcom.com [Fri, 20 Jun 2014 00:28:53 +0000 (17:28 -0700)]
Added code to reuse the signal fds and avoid fd close
Bug
15436535
Change-Id: Ica5b1915dd94699eb19c57b6904154493b0cc08c
git-zhenye.broadcom.com [Thu, 12 Jun 2014 23:52:46 +0000 (16:52 -0700)]
Fixed deadlock issue for concurrent multiple rfcomm connections.
Bug
15469934
Change-Id: I77a3dc97c92f0ccd5764220e8e0bf5c0689d7b12
Hemant Gupta [Fri, 18 Apr 2014 07:24:08 +0000 (12:54 +0530)]
Bluetooth: Support MAP Client role on Bluedroid.
Implementation changes from BTA and BTIF layer to support
MCE role on Bluedroid stack.
Change-Id: I8547b0f28338e83edabae969121872ca23fdcb36
Mike Lockwood [Tue, 1 Jul 2014 03:30:09 +0000 (20:30 -0700)]
Fix audio HAL build (make it a shared library again)
Bug:
15978121
Change-Id: I23ba30f27b73b48a1d9128d294641367bfffa810
Satya Calloji [Tue, 1 Jul 2014 01:08:03 +0000 (01:08 +0000)]
am
7ae3f9ee: LE Onfound and Onlost feature
* commit '
7ae3f9eebc4e930d51e6b61f845ffd0f9a8cb9f8':
LE Onfound and Onlost feature
Satya Calloji [Tue, 1 Jul 2014 01:08:03 +0000 (01:08 +0000)]
am
5e177043: (-s ours) LE ADV Filter changes
* commit '
5e177043e3dfcd70676761a40425179d16c4a7ce':
LE ADV Filter changes
Richie Hsieh [Thu, 17 Apr 2014 14:39:31 +0000 (22:39 +0800)]
Add BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
Added CleanSpec.mk change
Signed-off-by: Richie Hsieh <richie.hsieh@mediatek.com>
Change-Id: Ice2a514f3d24859dbf091aae30e5c8781e90b7fd
(cherry picked from commit
d343338cb4c42e62ac97c451bc23fb36d9b58d3f)
Satya Calloji [Tue, 1 Jul 2014 01:02:50 +0000 (01:02 +0000)]
am
b9b1f4e7: (-s ours) LE batch scan feature
* commit '
b9b1f4e7a5cc96c57873a991f4ea3c3c08934c26':
LE batch scan feature
Satya Calloji [Sun, 15 Jun 2014 06:16:18 +0000 (23:16 -0700)]
LE Onfound and Onlost feature
BTIF and stack layer changes for onfound/onlost feature
DO NOT MERGE
Change-Id: Id52cdd5855ca8c0ff276b42613b51c4cd3882bfc
Satya Calloji [Thu, 5 Jun 2014 20:15:15 +0000 (13:15 -0700)]
LE ADV Filter changes
BTIF and stack layer changes for ADV filter feature
DO NOT MERGE
Change-Id: I865e57c41802751e172248547b8510598261ec94
Satya Calloji [Sun, 11 May 2014 06:46:24 +0000 (23:46 -0700)]
LE batch scan feature
BTIF and stack changes for batch scan feature
DO NOT MERGE
Change-Id: I4dd2d551435e9f1f0e43906bd695294e97ed4bba
Matthew Xie [Mon, 30 Jun 2014 22:37:13 +0000 (22:37 +0000)]
am
66432dcf: Add WBS support on Bluedroid (2/6)
* commit '
66432dcffe211e317d35978283a04a96d5620bdf':
Add WBS support on Bluedroid (2/6)
Matthew Xie [Sun, 27 Apr 2014 12:45:32 +0000 (05:45 -0700)]
Add WBS support on Bluedroid (2/6)
Bug
13764086
Change-Id: I12bf302f7dd19efb497ad49d4d1d638a7a926049
Satya Calloji [Sun, 15 Jun 2014 06:16:18 +0000 (23:16 -0700)]
LE Onfound and Onlost feature
BTIF and stack layer changes for onfound/onlost feature
Change-Id: Id52cdd5855ca8c0ff276b42613b51c4cd3882bfc
Satya Calloji [Thu, 5 Jun 2014 20:15:15 +0000 (13:15 -0700)]
LE ADV Filter changes
BTIF and stack layer changes for ADV filter feature
Change-Id: I865e57c41802751e172248547b8510598261ec94
Satya Calloji [Sun, 11 May 2014 06:46:24 +0000 (23:46 -0700)]
LE batch scan feature
BTIF and stack changes for batch scan feature
Change-Id: I4dd2d551435e9f1f0e43906bd695294e97ed4bba
Nitin Arora [Mon, 30 Jun 2014 19:25:19 +0000 (19:25 +0000)]
am
021e17a6: Clear background conn list entries during BT power off
* commit '
021e17a641e61e3f139717cd755bf6f9b9b9eb12':
Clear background conn list entries during BT power off
Andre Eisenbach [Mon, 30 Jun 2014 19:25:19 +0000 (19:25 +0000)]
am
9279e000: Merge "Bluetooth: Updates background conn list properly during unpair" into klp-wireless-dev
* commit '
9279e0003d43be077d2c2d7a3e5163db960a1150':
Bluetooth: Updates background conn list properly during unpair
Nitin Arora [Thu, 30 Jan 2014 03:18:39 +0000 (19:18 -0800)]
Clear background conn list entries during BT power off
This clears whitelist entries and resets bgconn device lists
Change-Id: I551791d63fa826071c113abd383540838f6c59b2
Richie Hsieh [Wed, 25 Jun 2014 23:32:49 +0000 (16:32 -0700)]
LE: Fix HOGP connection issues caused by incorrect HCI packet flags
Do not set the automatically-flushable packet flag for LE bound HCI
packets (Packet_Boundary_Flag 0b10).
Reported-by: Richie Hsieh <richie.hsieh@mediatek.com>
Change-Id: Id71a096acee70582923e652cfef1f4141b721fed
Hemant Gupta [Sun, 29 Jun 2014 19:36:13 +0000 (19:36 +0000)]
am
d9e2d0f1: Bluetooth: Restarting PM timer during incoming rfcomm data.
* commit '
d9e2d0f1fa19f737632e82c24ba278990b8a7548':
Bluetooth: Restarting PM timer during incoming rfcomm data.
Hemant Gupta [Sun, 29 Jun 2014 19:36:12 +0000 (19:36 +0000)]
am
e146869f: GAP: Remove device info from storage on Pairing Cancel
* commit '
e146869fec903400e601d2ac7b0a59bd05934f0e':
GAP: Remove device info from storage on Pairing Cancel
Hemant Gupta [Sun, 29 Jun 2014 19:36:12 +0000 (19:36 +0000)]
am
b4801441: GAP:Add authentication failed error code in auth_compl_evt.
* commit '
b4801441a5b7a093bc78f2143a8ed28605c51dc6':
GAP:Add authentication failed error code in auth_compl_evt.
Hemant Gupta [Sun, 29 Jun 2014 18:53:55 +0000 (18:53 +0000)]
am
aef7a671: [2/2] Bluetooth: Security: Handle authentication rejected error status
* commit '
aef7a6716e72e9304af36469500ee53c97350c21':
[2/2] Bluetooth: Security: Handle authentication rejected error status
Hemant Gupta [Sun, 29 Jun 2014 18:23:40 +0000 (18:23 +0000)]
am
59a88ec2: Bluetooth: Handle missing key event
* commit '
59a88ec207ead601c7ba5e767fd1373c7f2df70b':
Bluetooth: Handle missing key event
Hemant Gupta [Sun, 29 Jun 2014 18:23:40 +0000 (18:23 +0000)]
am
831423ea: Bluetooth: Fix to avoid NULL pointer dereferences
* commit '
831423ea1879244e746f39d7696ad4a66681f306':
Bluetooth: Fix to avoid NULL pointer dereferences
Hemant Gupta [Sun, 29 Jun 2014 18:23:39 +0000 (18:23 +0000)]
am
c8fe2925: GAP: Retain the old COD if already present
* commit '
c8fe2925af4f5b167b615a0677adebbd156a4387':
GAP: Retain the old COD if already present
Hemant Gupta [Sun, 29 Jun 2014 18:10:19 +0000 (18:10 +0000)]
am
79f454dc: L2CAP: Send HCI connect with all packet types supported
* commit '
79f454dc544280cc1a3ca3acc643f7dddfe91cd9':
L2CAP: Send HCI connect with all packet types supported
Hemant Gupta [Mon, 30 Sep 2013 12:56:03 +0000 (18:26 +0530)]
Bluetooth: Restarting PM timer during incoming rfcomm data.
During incoming rfcomm data, we were setting the pm mode to
active, thereby stopping timer and never restarting it again.
So Dut was never going to sniff , if the last packet is incoming
packet. Therefore add change to restart the PM timer during incoming
data.
Change-Id: I4396bb2f267b12cb92a944c15609ddeaa13288ad
Hemant Gupta [Thu, 14 Nov 2013 10:51:29 +0000 (16:21 +0530)]
GAP: Remove device info from storage on Pairing Cancel
Remove paired device information for SSP devices from the BT-IF
layer storage on pairing cancel.
Change-Id: I4660e3659866bd66339350b5cdb92bf3ad3cc850
Hemant Gupta [Tue, 7 Jan 2014 12:41:15 +0000 (18:11 +0530)]
GAP:Add authentication failed error code in auth_compl_evt.
There is an unhandle failed HCI error code when pairing with
symbian OS phone nokia n95 which will cause no prompt when
auth failed.
Change-Id: I3a37c7732d1bf71c090bb968380d8c5f0af2ff79
Hemant Gupta [Wed, 31 Jul 2013 13:30:12 +0000 (19:00 +0530)]
[2/2] Bluetooth: Security: Handle authentication rejected error status
Handle error codes in authentication complete event with failures
like reject pairing , unspecified error.
Change-Id: I392b7531a8625efbf91bf80f7f617a6954229892
Hemant Gupta [Wed, 19 Mar 2014 13:31:35 +0000 (19:01 +0530)]
Bluetooth: Handle missing key event
This change handles HCI_ERR_KEY_MISSING event
coming to the stack when user doesn't enter any
key and timeout happens.
Change-Id: If530e8acce3f105e4f1e2841bf350ee5330f389e
Hemant Gupta [Wed, 8 Jan 2014 07:12:13 +0000 (12:42 +0530)]
Bluetooth: Fix to avoid NULL pointer dereferences
This fix for avoiding NULL pointer dereferences:
- Added check for state checking in btm_remove_acl function
to avoid sending disconnect command if already in Disconnecting
state.
- Added NULL check for 'pin_code' in btif_dm_pin_reply function
- Null check before accessing in BD interface layer configuration
node variables.
- Add NULL check before accessing p_bd_addr variable to avoid null
pointer exception while referring to invalid memory.
Change-Id: Ib7ed45b6a1692785a45224d739a564f767e5b10f
Hemant Gupta [Wed, 30 Oct 2013 14:40:04 +0000 (20:10 +0530)]
GAP: Retain the old COD if already present
Retain the old COD as the initial value if the device
entry already present in the list and entry is not in use.
Change-Id: I99b7269b1976ef7458c6568441e6e3c1e015a75f
Hemant Gupta [Tue, 30 Jul 2013 12:21:48 +0000 (17:51 +0530)]
L2CAP: Send HCI connect with all packet types supported
HCI create connect function is now supporting only single slot packet
during HCI connection initiation. Added support for all basic rate
packet types.
Change-Id: Ieeb892ea43dc9bb801a8f97a644a0f8c06b8184a
Matthew Xie [Sun, 29 Jun 2014 05:18:28 +0000 (05:18 +0000)]
am
96cdc153: Merge "GAP: Handle invalid SDP service search request" into klp-wireless-dev
* commit '
96cdc153002c82d959f132d6e6804b516228ff32':
GAP: Handle invalid SDP service search request
Matthew Xie [Sun, 29 Jun 2014 05:18:27 +0000 (05:18 +0000)]
am
08b1c8d9: Merge "GAP: Handled collision scenerio with headset" into klp-wireless-dev
* commit '
08b1c8d9147c253fecd34686b0c4dcd5b78cc778':
GAP: Handled collision scenerio with headset
Sharvil Nanavati [Sun, 29 Jun 2014 05:10:07 +0000 (05:10 +0000)]
am
f844e6ea: Fix build: remove bte_version.c from makefile since it\'s not in the tree.
* commit '
f844e6ea7bf26589c0c00a135451c0279e6b177a':
Fix build: remove bte_version.c from makefile since it's not in the tree.
Sharvil Nanavati [Sun, 29 Jun 2014 05:03:24 +0000 (22:03 -0700)]
Fix build: remove bte_version.c from makefile since it's not in the tree.
Change-Id: I4e488cadd2b52e41ec83e4b2acac2dd7f9ca5b61
Sharvil Nanavati [Sun, 29 Jun 2014 04:25:41 +0000 (04:25 +0000)]
am
f0952b52: Add a flexible array to the end of BT_HDR to avoid pointer arithmetic.
* commit '
f0952b522e3326b79b146e7c3c59fa3b29d59de6':
Add a flexible array to the end of BT_HDR to avoid pointer arithmetic.
Sharvil Nanavati [Sun, 29 Jun 2014 04:21:20 +0000 (04:21 +0000)]
am
5055c9d0: Eliminate HCI flow control. It is not used anywhere in the codebase.
* commit '
5055c9d0061aaa451de9ee33d6d2d2716f188e0f':
Eliminate HCI flow control. It is not used anywhere in the codebase.
Sharvil Nanavati [Sun, 29 Jun 2014 04:21:20 +0000 (04:21 +0000)]
am
5c0b9111: Remove BTE/BTIF version strings. DID profile should specify stack version info.
* commit '
5c0b91113bdc32eba2db928efae625eee9a2e65e':
Remove BTE/BTIF version strings. DID profile should specify stack version info.
Sharvil Nanavati [Tue, 24 Jun 2014 23:45:55 +0000 (16:45 -0700)]
Add a flexible array to the end of BT_HDR to avoid pointer arithmetic.
This change should clean up a lot of code. I've verified sizeof(BT_HDR)
remains constant after this change on ARM, x86, and x86_64.
Change-Id: I762351fa0f24a587da190de3e522bc74e497c542
Sharvil Nanavati [Tue, 24 Jun 2014 07:39:06 +0000 (00:39 -0700)]
Eliminate HCI flow control. It is not used anywhere in the codebase.
Change-Id: If7244bdcf08023b0a093374950d6a5c1974fbbba
Sharvil Nanavati [Sun, 29 Jun 2014 04:18:14 +0000 (04:18 +0000)]
am
75e8f419: Eliminate unused argument to dealloc.
* commit '
75e8f4192e75ded418a7d228959c2ec99a13fa73':
Eliminate unused argument to dealloc.
Sharvil Nanavati [Sun, 29 Jun 2014 04:18:14 +0000 (04:18 +0000)]
am
c5856ba5: Add documentation and non-blocking functions to fixed_queue.
* commit '
c5856ba565d4d6952f465164a98807fb274b96e6':
Add documentation and non-blocking functions to fixed_queue.
Sharvil Nanavati [Wed, 25 Jun 2014 00:24:33 +0000 (17:24 -0700)]
Remove BTE/BTIF version strings. DID profile should specify stack version info.
Change-Id: I27806f8a88f7ea81ccab1fe48ab826ba428357e0
Sharvil Nanavati [Wed, 25 Jun 2014 00:02:30 +0000 (17:02 -0700)]
Eliminate unused argument to dealloc.
Change-Id: I9e54a9b9e8e250aa39e4fbfcbe934e7686d74cd4
Sharvil Nanavati [Mon, 23 Jun 2014 19:25:40 +0000 (12:25 -0700)]
Add documentation and non-blocking functions to fixed_queue.
Change-Id: Ia13166238847d6e1cebfda1bf5bdafd9ddc8b8e1
Matthew Xie [Sat, 28 Jun 2014 20:51:06 +0000 (13:51 -0700)]
featurize ble specific function to fix compile error on non-ble target
Change-Id: Ib968b55b407f6c4413d53623113c47f335c5f800
Andre Eisenbach [Sat, 28 Jun 2014 19:24:43 +0000 (19:24 +0000)]
am
249f600c: LE: Add is_connected() function (2/3)
* commit '
249f600c1518c015f5cb45720cb022a203ba744e':
LE: Add is_connected() function (2/3)
Andre Eisenbach [Sat, 28 Jun 2014 19:24:42 +0000 (19:24 +0000)]
am
493a98a8: LE: Add notification sent and congestion callbacks (2/4)
* commit '
493a98a8de29a35808db28470736819af5fd22d2':
LE: Add notification sent and congestion callbacks (2/4)
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:42 +0000 (19:24 +0000)]
am
a3164c9b: Add documentation for semaphore and add a semaphore_try_wait function.
* commit '
a3164c9b0b2da60509f16bcbc23c36e30d3df862':
Add documentation for semaphore and add a semaphore_try_wait function.
Chris Manton [Sat, 28 Jun 2014 19:24:41 +0000 (19:24 +0000)]
am
0aee3319: BLE privacy timer
* commit '
0aee331900424ed23857ee2390fbb03338a60d91':
BLE privacy timer
Chris Manton [Sat, 28 Jun 2014 19:24:41 +0000 (19:24 +0000)]
am
3466f510: RIP: Removal of more dead timer code
* commit '
3466f510fc41f71021ac46dbbd9734d828942332':
RIP: Removal of more dead timer code
Chris Manton [Sat, 28 Jun 2014 19:24:40 +0000 (19:24 +0000)]
am
5ec39bbc: Extended a few timer API functions
* commit '
5ec39bbc74875868ba54e837c6bd30bfa022563f':
Extended a few timer API functions
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:40 +0000 (19:24 +0000)]
am
0e377135: Clean up DID configuration parsing.
* commit '
0e377135cf8a38f2a8ec194b77bbb51dea0c0095':
Clean up DID configuration parsing.
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:39 +0000 (19:24 +0000)]
am
f3b23f23: Clean up interaction with libbt-vendor library.
* commit '
f3b23f231a39176ea371c4da717e084b3d7cc15a':
Clean up interaction with libbt-vendor library.
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:39 +0000 (19:24 +0000)]
am
138ca8b8: Make unit tests pass again after OS callout change.
* commit '
138ca8b8b121c17ff3ee9a7c10d76246a5c7325b':
Make unit tests pass again after OS callout change.
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:38 +0000 (19:24 +0000)]
am
7c9976dc: Logging cleanup: GKI.
* commit '
7c9976dc5e4d70630f8ca0f61b0bd7bdfaf0dba3':
Logging cleanup: GKI.
Sharvil Nanavati [Sat, 28 Jun 2014 19:24:38 +0000 (19:24 +0000)]
am
8cb7fe3c: Fix build for mako devices.
* commit '
8cb7fe3cdf4951fc58669a053496fca2ad3f52d3':
Fix build for mako devices.
Sharvil Nanavati [Sat, 28 Jun 2014 19:22:29 +0000 (12:22 -0700)]
resolved conflicts for merge of
a7d7eb78 to master
Change-Id: I547dbf3c212eb5658c43f9822587431a7bcbbac3
Sharvil Nanavati [Sat, 28 Jun 2014 19:18:07 +0000 (12:18 -0700)]
resolved conflicts for merge of
01beea4b to master
Change-Id: I340c31de8ece1580a9a6ab9370b9815ecdd54b49
Sharvil Nanavati [Sat, 28 Jun 2014 18:43:18 +0000 (18:43 +0000)]
am
92de6fd7: Logging cleanup: remove unused macros.
* commit '
92de6fd7bb570a60593223b78302601dc0637dea':
Logging cleanup: remove unused macros.
Matthew Xie [Sat, 28 Jun 2014 18:42:11 +0000 (11:42 -0700)]
resolved conflicts for merge of
93f66512 to master
Change-Id: Ieb2fd742d9baddce8a61fe073a61e39a180cf426
Matthew Xie [Sat, 28 Jun 2014 18:35:29 +0000 (11:35 -0700)]
resolved conflicts for merge of
e8c3d75b to master
Change-Id: I78ef69c4d54a36243620ae14296d3507e3339567
Matthew Xie [Sat, 28 Jun 2014 17:58:27 +0000 (10:58 -0700)]
resolved conflicts for merge of
b44cc59d to master
Change-Id: I74c86dd5a13d4cc0b225a4b1d516904c4382db74
Sharvil Nanavati [Sat, 28 Jun 2014 17:35:42 +0000 (17:35 +0000)]
am
158084e0: Logging cleanup: A2D, AVDT, and AVCT.
* commit '
158084e065230a10ffeba6b24ab2fd22b422baed':
Logging cleanup: A2D, AVDT, and AVCT.
Sharvil Nanavati [Sat, 28 Jun 2014 17:35:41 +0000 (17:35 +0000)]
am
d6e1b1ee: Logging cleanup: HIDH, BNEP, and PAN.
* commit '
d6e1b1ee17959461a80936f7308d8129615315d2':
Logging cleanup: HIDH, BNEP, and PAN.
Sharvil Nanavati [Sat, 28 Jun 2014 17:35:41 +0000 (17:35 +0000)]
am
d5bba906: Logging cleanup: RFCOMM and GAP.
* commit '
d5bba906b0704cd60e824613bd2e438935ba5d89':
Logging cleanup: RFCOMM and GAP.
Matthew Xie [Sat, 28 Jun 2014 17:28:40 +0000 (10:28 -0700)]
resolved conflicts for merge of
a51c9d9d to master
Change-Id: I50eec2efe06017bddac291846fa098c26dc10da1
Matthew Xie [Sat, 28 Jun 2014 17:12:51 +0000 (10:12 -0700)]
handle link key check in non_ble case
Change-Id: Ibbdf3c4fbff9e53f8e2a85db9d6de62cd2925c60
Matthew Xie [Sat, 28 Jun 2014 06:47:40 +0000 (06:47 +0000)]
am
f219040f: Merge "Reload Hid info only for bonded device" into klp-wireless-dev
* commit '
f219040fb458fe4bb19d55d39c28d4535865a908':
Reload Hid info only for bonded device
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
OSDN Git Service
