OSDN Git Service
Satya Calloji [Thu, 7 May 2015 21:06:37 +0000 (14:06 -0700)]
Fix for chip capability version check
Fixes the issue of extended scan command being sent out
for non-capable chipsets
Bug:
20916419
Change-Id: Ib5d848f49c34a3fc9c053a7488e12fb0c252587c
Nitin Arora [Wed, 20 May 2015 09:51:59 +0000 (09:51 +0000)]
am
643aea51: Fix allocation for LE scan filter parameters
* commit '
643aea51738e1a472f29354f02b7d941df488a4a':
Fix allocation for LE scan filter parameters
Nitin Arora [Wed, 20 May 2015 09:51:58 +0000 (09:51 +0000)]
am
ecce764b: Fix for premature BLE RPA timeout
* commit '
ecce764b6cc35d15b591ffac48d1dc044f32fa6e':
Fix for premature BLE RPA timeout
Satya Calloji [Wed, 20 May 2015 09:51:58 +0000 (09:51 +0000)]
am
7cb76b42: Fix GATT connection failure after BT reset
* commit '
7cb76b4277d603e5abfe7f9222a45ebdf7a715e2':
Fix GATT connection failure after BT reset
Nitin Arora [Wed, 20 May 2015 09:51:57 +0000 (09:51 +0000)]
am
6e872cb5: Use correct structure to read LE connection handle
* commit '
6e872cb5f5329d7f747091ba759f832bab4b45ec':
Use correct structure to read LE connection handle
Nitin Arora [Fri, 12 Sep 2014 01:35:55 +0000 (18:35 -0700)]
Fix allocation for LE scan filter parameters
This change allocates memory for LE scan filter parameters
to copy filter params set by btif inquiry process initiated
using Settings UI
Change-Id: I56ed33b80af3f26ddc8a83edb807f88048503fa7
Nitin Arora [Wed, 11 Mar 2015 17:40:59 +0000 (10:40 -0700)]
Fix for premature BLE RPA timeout
RPA timeout expires prematurely when multiple FindMe server
instances start and stop advertisiment continuously. During start
adv TIMER3 is started using oneshot timer and during stop adv
same TIMER0 is stopped, so the TIMER3 is still running and expires
prematurely. This fix stops TIMER3 during disable adv and when RPA
is sent to controller.
Change-Id: I336f84043e5e0e8a833cc6080f8bcc0c1665893e
Satya Calloji [Thu, 7 May 2015 16:45:00 +0000 (09:45 -0700)]
Fix GATT connection failure after BT reset
Handles the address type incorrect value storage issue
and removes usage of DMT supported flag which was based
on legacy code
Bug:
20912064
Change-Id: I5bd20dc9cd0997ac3dbd4b346cc0513f1809f241
Nitin Arora [Thu, 31 Jul 2014 20:00:21 +0000 (13:00 -0700)]
Use correct structure to read LE connection handle
This patch corrects the retrieval of the connection handle
after the gatt write operation has succeeded successfully.
Change-Id: Iac79a64d6c626c2349b6f1a3744ea49a521a45f4
Zach Johnson [Tue, 19 May 2015 23:03:12 +0000 (23:03 +0000)]
am
0ef6b347: Build the shared library with --whole-archive
* commit '
0ef6b347b8cf1a9e83e6b680a0ee025da24f00b6':
Build the shared library with --whole-archive
Satya Calloji [Tue, 19 May 2015 23:02:54 +0000 (23:02 +0000)]
am
7bd4038e: Fix for IRK and IR key write issue
* commit '
7bd4038ea9a2f1953dc98fa67aec413b6247c584':
Fix for IRK and IR key write issue
Andre Eisenbach [Tue, 19 May 2015 22:51:39 +0000 (22:51 +0000)]
am
60361470: Re-enabled enhanced inquiry scan
* commit '
603614704658ce7081a61a4f8929a1a979b2b449':
Re-enabled enhanced inquiry scan
Chih-Hung Hsieh [Tue, 19 May 2015 22:51:08 +0000 (22:51 +0000)]
am
1536a0e3: Fix format-security warning found by clang/llvm.
* commit '
1536a0e3d6a8b149644dfe3f7238ae5c6f6e853a':
Fix format-security warning found by clang/llvm.
Zach Johnson [Tue, 19 May 2015 21:49:37 +0000 (14:49 -0700)]
Build the shared library with --whole-archive
For stack static libraries, use LOCAL_WHOLE_STATIC_LIBRARIES
to ensure they get --whole-archive applied to them.
This means module symbols in static libraries won't be
removed by the linker and dlsym will find them.
This patch also removes the code hacks we needed to
trick the linker into including the module symbols in
the final shared library.
Change-Id: I2463d0e6fb38f1e75c8293179cf9d4ca33eda84e
Satya Calloji [Tue, 19 May 2015 21:42:32 +0000 (14:42 -0700)]
Fix for IRK and IR key write issue
Fixes the incorrect flipping of values
for IRK and IR keys in bt_config.conf file
Change-Id: Ia4f9c274b6a3f7594ec31d8bd89b27d1ae54ac78
Andre Eisenbach [Tue, 19 May 2015 19:22:59 +0000 (12:22 -0700)]
Re-enabled enhanced inquiry scan
A merge/re-factoring error caused enhanced inquiry scan to be disabled,
severely slowing down inquiry and device name resolution.
Change-Id: Id7bc1687a1e1bbbbc8b8b42cc184ce628b6d1b9c
Chih-Hung Hsieh [Tue, 19 May 2015 18:18:35 +0000 (11:18 -0700)]
Fix format-security warning found by clang/llvm.
BUG:
21299815
Change-Id: I3dd7e92444a9b439c210f7e6ce677307a38113ab
Andre Eisenbach [Tue, 19 May 2015 03:14:06 +0000 (03:14 +0000)]
am
873ca2f9: Fix string template in connection event debug log
* commit '
873ca2f973321f67df845e8658ede02bf5d9ee0b':
Fix string template in connection event debug log
Andre Eisenbach [Tue, 19 May 2015 01:44:03 +0000 (18:44 -0700)]
Fix string template in connection event debug log
Also fixed timestamp/bdname buffer confusion.
Change-Id: Idab9746a87ec665cba836c79978f03e13c36d17b
Andre Eisenbach [Tue, 19 May 2015 02:24:05 +0000 (02:24 +0000)]
am
d360896e: Merge "Include osi_module reference in module_init funcion" into mnc-dev
* commit '
d360896e85983a4a6f917e1b290a8b98d9a07444':
Include osi_module reference in module_init funcion
Andre Eisenbach [Tue, 19 May 2015 02:04:44 +0000 (02:04 +0000)]
Merge "Include osi_module reference in module_init funcion" into mnc-dev
Andre Eisenbach [Tue, 19 May 2015 01:42:29 +0000 (18:42 -0700)]
Include osi_module reference in module_init funcion
This prevents a crash-loop if the module is stripped by the linker.
Change-Id: I7a3f0349cb62a9e73e003707c1f48ec0a6de7f67
Chih-Hung Hsieh [Mon, 18 May 2015 22:58:49 +0000 (22:58 +0000)]
am
665e63d5: Merge "Include gki.h to get correct function declarations." into mnc-dev
* commit '
665e63d5f16cb725b21e163be411709c39a0569a':
Include gki.h to get correct function declarations.
Chih-Hung Hsieh [Mon, 18 May 2015 22:34:03 +0000 (22:34 +0000)]
Merge "Include gki.h to get correct function declarations." into mnc-dev
Zach Johnson [Mon, 18 May 2015 22:32:17 +0000 (22:32 +0000)]
am
5da8446f: Fix AlarmTestHarness so alarm tests pass again
* commit '
5da8446fd7c649350aef16d8a9e0d731a9526241':
Fix AlarmTestHarness so alarm tests pass again
Andre Eisenbach [Mon, 18 May 2015 22:21:37 +0000 (22:21 +0000)]
am
3e3d2a1d: Shutdown alarm callbacks on stack disable; added OSI module
* commit '
3e3d2a1d3bb9ada4fa612bf9d58c05b629385af2':
Shutdown alarm callbacks on stack disable; added OSI module
Chih-Hung Hsieh [Mon, 18 May 2015 22:21:01 +0000 (22:21 +0000)]
am
56350d68: Include gki.h to get correct function declarations.
* commit '
56350d683a15117b9e80ff3bf3b83671f3a7491a':
Include gki.h to get correct function declarations.
Chih-Hung Hsieh [Mon, 18 May 2015 21:36:21 +0000 (14:36 -0700)]
Include gki.h to get correct function declarations.
BUG:
21119653
Change-Id: I8e4caf1946f525ea57fadf003ca3fd7d303976cb
(cherry picked from commit
56350d683a15117b9e80ff3bf3b83671f3a7491a)
Zach Johnson [Mon, 18 May 2015 21:48:50 +0000 (14:48 -0700)]
Fix AlarmTestHarness so alarm tests pass again
Ensures all alarm resources are torn down before the
test ends, so the allocation tracker is happy and
doesn't assert-fail the tests.
Also guard alarm_shutdown to make sure it only runs
if lazy_initialize was run (to avoid undefined behavior)
Change-Id: Iaf78fe85edd2fc65b9c5ee11c74665a11a3bc9ba
Chih-Hung Hsieh [Mon, 18 May 2015 21:36:21 +0000 (14:36 -0700)]
Include gki.h to get correct function declarations.
BUG:
21119653
Change-Id: I8e4caf1946f525ea57fadf003ca3fd7d303976cb
Andre Eisenbach [Mon, 18 May 2015 16:41:06 +0000 (09:41 -0700)]
Shutdown alarm callbacks on stack disable; added OSI module
Change-Id: Iecf1e2258da012bdac69a4f57d38b12a272e3edd
Andre Eisenbach [Thu, 14 May 2015 19:30:22 +0000 (19:30 +0000)]
am
1287166d: DO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSE
* commit '
1287166da9c34f041d54a78800b79cb2738675a9':
DO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSE
Andre Eisenbach [Sat, 9 May 2015 00:42:10 +0000 (17:42 -0700)]
DO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSE
This is not a comprehensive fix. More work is necessary to ensure the
correct separation of BLE_INCLUDED TRUE/FALSE as well as removing many
of the hacked-up if() statements resulting from this patch.
Change-Id: I1812594feba0bf43369096e472a8b18cde305255
Mudumba Ananth [Wed, 13 May 2015 21:19:20 +0000 (21:19 +0000)]
am
b4180cf8: Fix BT PAN crash by re-ordering callback initialization
* commit '
b4180cf8a5d70f9e1e815b64ba5e1df25d2fdda4':
Fix BT PAN crash by re-ordering callback initialization
Mudumba Ananth [Wed, 6 May 2015 16:15:41 +0000 (09:15 -0700)]
Fix BT PAN crash by re-ordering callback initialization
Bug:
20868163
Change-Id: I8e3bb844b96b762f90a85d8d9d678a1a9cec9c32
Andre Eisenbach [Wed, 13 May 2015 15:21:52 +0000 (15:21 +0000)]
am
91fbc7e5: Fix compilation on platforms with BLE_INCLUDED == FALSE
* commit '
91fbc7e560bb9c9f344980a18983d32e51f0360a':
Fix compilation on platforms with BLE_INCLUDED == FALSE
Andre Eisenbach [Sat, 9 May 2015 00:42:10 +0000 (17:42 -0700)]
Fix compilation on platforms with BLE_INCLUDED == FALSE
This is not a comprehensive fix. More work is necessary to ensure the
correct separation of BLE_INCLUDED TRUE/FALSE as well as removing many
of the hacked-up if() statements resulting from this patch.
Change-Id: I1812594feba0bf43369096e472a8b18cde305255
Andre Eisenbach [Tue, 12 May 2015 16:22:37 +0000 (16:22 +0000)]
am
89f5e411: Bluetooth native dumpsys logging support (2/5)
* commit '
89f5e411d9ef31436741288a2267e46dd744e273':
Bluetooth native dumpsys logging support (2/5)
Andre Eisenbach [Fri, 5 Dec 2014 17:40:20 +0000 (09:40 -0800)]
Bluetooth native dumpsys logging support (2/5)
Includes support for BTSnoop logging in memory.
Bug:
18508263
Change-Id: I175da528cbcdc00d40622647d518a74210cfe6fd
Chih-Hung Hsieh [Mon, 11 May 2015 21:22:31 +0000 (21:22 +0000)]
am
8365a61b: Merge "Work around clang/llvm compilation problems."
* commit '
8365a61be35c3526352ae4b82f1dc92b031023ac':
Work around clang/llvm compilation problems.
Chih-Hung Hsieh [Mon, 11 May 2015 21:02:26 +0000 (21:02 +0000)]
Merge "Work around clang/llvm compilation problems."
Andre Eisenbach [Mon, 11 May 2015 19:38:49 +0000 (19:38 +0000)]
am
a778a64c: Only register key types with uinput that we can actually map
* commit '
a778a64c053acdb99b7a14b5837b4f12d83009a1':
Only register key types with uinput that we can actually map
Andre Eisenbach [Mon, 11 May 2015 18:49:59 +0000 (11:49 -0700)]
Only register key types with uinput that we can actually map
Bug:
20641307
Change-Id: I40cb1e22c35963429481a2cc9da897b5b2f554fe
Pavlin Radoslavov [Sun, 10 May 2015 11:10:07 +0000 (11:10 +0000)]
am
98d77544: Elimininate unnecessary calls for releasing the wake lock.
* commit '
98d775444ced716aac74eddb5471a49b5ca6f798':
Elimininate unnecessary calls for releasing the wake lock.
Pavlin Radoslavov [Sat, 9 May 2015 02:39:31 +0000 (19:39 -0700)]
Elimininate unnecessary calls for releasing the wake lock.
Bug:
20884459
Change-Id: Id010cb29cf09b95800dc9f5fd5b660e71e4a47bc
Brian Carlstrom [Fri, 8 May 2015 05:33:40 +0000 (05:33 +0000)]
am
f6c48a09: Resetting system/bt
* commit '
f6c48a09e398de804f7d563a44904e917afd2c32':
Resetting system/bt
Brian Carlstrom [Fri, 8 May 2015 04:54:08 +0000 (21:54 -0700)]
Resetting system/bt
git reset --hard
fa5fec7c98ff3c56bd825bc51a1d28bdc3bad0bb^^
git reset --soft aosp/master
git commit -a
Change-Id: I2939d9bbd825110a42a71008e5255945e38a77e1
Chih-Hung Hsieh [Mon, 4 May 2015 19:12:39 +0000 (12:12 -0700)]
Work around clang/llvm compilation problems.
These patches will allow us to compile the whole AOSP with clang/llvm
before all the following problems are fixed.
* Suppress warnings on unused variables.
* Remove unused static variables.
* Use only gcc to compile code that requires gcc atomic functions.
They should be converted to standard atomic functions later.
* Suppress warnings on redefined typedefs.
BUG:
20765701
Change-Id: Ib1d6e2ef86c255ba87c1d51f9fdeabe5c8de2ada
(cherry picked from commit
23546918662bba21937c4f8fb4c3373588710b5c)
Zach Johnson [Thu, 7 May 2015 21:17:16 +0000 (21:17 +0000)]
Merge "Work around clang/llvm compilation problems." into mnc-dev
David Stevens [Thu, 7 May 2015 17:32:10 +0000 (17:32 +0000)]
Merge "Handle lack of service better" into mnc-dev
Satya Calloji [Tue, 31 Mar 2015 20:24:32 +0000 (13:24 -0700)]
LE low power scan feature
LE low power extended scan feature stack changes
based on Google BLE spec v0.95
Bug:
20029342
Change-Id: I1db2d9bb648295340d0e93ca89d27e1b938d33d3
Andre Eisenbach [Thu, 7 May 2015 05:32:05 +0000 (05:32 +0000)]
Merge "Increases number of LE multi-advertiser instances supported" into mnc-dev
Nitin Arora [Thu, 30 Apr 2015 18:47:21 +0000 (11:47 -0700)]
Increases number of LE multi-advertiser instances supported
Change-Id: I0d43b3922b2b5dc8c57511d908f45dfe8d8f1b9c
Andre Eisenbach [Thu, 7 May 2015 04:49:35 +0000 (21:49 -0700)]
Fix compilation on some platforms with LE disabled
Change-Id: Iabbb20b111beaaaef8a465f6917b4286e1b93972
Nitin Arora [Fri, 1 May 2015 00:20:27 +0000 (17:20 -0700)]
Fix allocation of instance ID for LE services
Defers the incrementing of the total services count after the allocation
of the instance ID for the service. If the increment is not deferred,
the current service is compared with its own instance in the cached
service list while allocating the instance ID. This leads to an
incorrect instance ID being allocated for the service.
Change-Id: I547888ae0f7015cfdb9b1a995373523699642a6c
David Stevens [Wed, 29 Apr 2015 17:44:04 +0000 (10:44 -0700)]
Handle lack of service better
- Set the service availability flag during ciev events
- Don't drop AT+COPS and AT+CNUM events on the floor if there is no
service. Instead, send fake OK responses up the stack.
Bug:
20127723
Change-Id: Id2d9ae8c5df5b5372e50e804e44ed51657b2a4a9
Chih-Hung Hsieh [Mon, 4 May 2015 19:12:39 +0000 (12:12 -0700)]
Work around clang/llvm compilation problems.
These patches will allow us to compile the whole AOSP with clang/llvm
before all the following problems are fixed.
* Suppress warnings on unused variables.
* Remove unused static variables.
* Use only gcc to compile code that requires gcc atomic functions.
They should be converted to standard atomic functions later.
* Suppress warnings on redefined typedefs.
BUG:
20765701
Change-Id: I19bc0a256c19502fabcabd1ca158637a8b5741a2
Andre Eisenbach [Tue, 5 May 2015 19:36:12 +0000 (19:36 +0000)]
Merge "Ensure PAN is initialized before invoking callbacks" into mnc-dev
Andre Eisenbach [Tue, 5 May 2015 18:39:28 +0000 (11:39 -0700)]
Ensure PAN is initialized before invoking callbacks
Fix minor conditional check and clean up surrounding code.
Bug:
20717705
Change-Id: I581fda37708062327c86cc0548b2665c9811be25
Pavlin Radoslavov [Tue, 5 May 2015 01:28:52 +0000 (18:28 -0700)]
Fix a memory corruption issue when processing AVRCP packets.
As a side effect of the memory corruption, the AVRCP metadata
information was not visible.
Apparently, the bug was in a very old (almost unchanged) code,
and it was triggered because the rest of the code has evolved.
Bug:
20108272
Change-Id: I28466edf6a2fbfc31cfb46d74d03b6c0399f8594
Andre Eisenbach [Fri, 1 May 2015 20:14:59 +0000 (13:14 -0700)]
Use BTM structures for LE pairink keys and store LTK
The long term key (LTK) was not assigned to the correct struct element
before saving the key to NVRAM.
Change-Id: Icfce82f5b70518e725875771756edde0b9caeb88
Nitin Arora [Fri, 1 May 2015 20:11:28 +0000 (13:11 -0700)]
Stop media task alarm when task is exiting
Bug:
20717705
Change-Id: I76e76cf33d7c9f4366f921daf2230e4f681098f7
Andre Eisenbach [Thu, 30 Apr 2015 22:29:57 +0000 (15:29 -0700)]
Change "ltk" to "pltk" and "csrk" to "pcsrk"
To clarify local/peer key deliniation.
Change-Id: I79573015c80456ce3287acfe5551a6881ff581b2
Andre Eisenbach [Thu, 30 Apr 2015 05:27:15 +0000 (22:27 -0700)]
Fix LE pairing LTK storage issue
Two separate issues prevented the correct LTK from being storred in
non-volatile storage and thus prevented an LE device from working after
Bluetooth was restarted:
1. tBTM_SEC_BLE_KEYS contained a field "pltk" which stored the LTK, but
downstream the field "ltk" in the same structure was used to access
the key.
2. The structure element p_key_value was not deep-copied for
BTA_DM_BLE_KEY_EVT events, causing data corruption and instabilities.
This patch addresses both issues.
Bug:
20091926
Change-Id: I9f9481a44bfe83cacd351f9e578451e77b573564
Andre Eisenbach [Wed, 29 Apr 2015 18:25:50 +0000 (11:25 -0700)]
Add LE device to device database before adding LE keys
A small bug in btif_read_le_key() would prevent a paired LE device from
being added back into the internal device database after reboot, causing
the security keys not being loaded.
Also added a debug statement to trace keys being loaded.
Bug:
20091926
Change-Id: Id2d6c69497857edc21e2d4c6a67ad9e8dadabcaa
Nitin Shivpure [Tue, 28 Apr 2015 07:19:04 +0000 (12:49 +0530)]
Fix PAN initialization
Change-Id: I32d8975f0f6e1ea18a361a19260ffea7a3ec8467
Andre Eisenbach [Tue, 28 Apr 2015 08:56:38 +0000 (01:56 -0700)]
Keep track of pending LE background connections
In order to only scan for peripherals when we have pending background
connections, we need to keep track of devices that have been added to
the whitelist.
Bug:
20091926
Change-Id: Id7b1861829d984c150d69371ebd13f7d52d3093c
Chaojing Sun [Wed, 22 Apr 2015 20:40:21 +0000 (13:40 -0700)]
Cross transport key mapping fixes
Change-Id: I22d97303054eccc876c4a9c7c0a50e369ff4fa62
Etan Cohen [Fri, 24 Apr 2015 20:42:20 +0000 (13:42 -0700)]
Merge commit '
1c00656' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:41:56 +0000 (13:41 -0700)]
Merge commit '
00e8f5e' into merge2
Change-Id: Ifa83bd342458eba33fdd11a9db38d2f9e818b759
Etan Cohen [Fri, 24 Apr 2015 20:40:29 +0000 (13:40 -0700)]
Merge commit '
3aa5187' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:40:15 +0000 (13:40 -0700)]
Merge commit '
d9bb94c' into merge2
Change-Id: Ib7b05e8907497cf3e2f06a94ff25686ccba43a81
Etan Cohen [Fri, 24 Apr 2015 20:36:09 +0000 (13:36 -0700)]
Merge commit '
ca8e356' into merge2
Andre Eisenbach [Fri, 24 Apr 2015 05:19:59 +0000 (22:19 -0700)]
Fix LE pairing on hosts with privacy disabled
When privacy is disabled, the local BDA is not set correctly when ACL
connections are created. This leads to SMP pairing challenges to be sent
with the wrong local BDA (00:00:00:00:00:00).
Bug:
20091926
Change-Id: I554245a3a3cbed72d79aa6c1261c813999019e2b
Andre Eisenbach [Thu, 23 Apr 2015 17:54:10 +0000 (10:54 -0700)]
Add missing __func__ in btif_hf init()
Change-Id: I0fe4ea75c6448f43f1638614a9a6519fa58962de
Andre Eisenbach [Thu, 23 Apr 2015 02:21:03 +0000 (19:21 -0700)]
Fix possible race conditoi in hands-free initialization
With the LE-only mode changes in place, there is a potential race
condition between the audio-gateway (AG) registration and the hands-free
service initialization as the core stack is now initialized before the
hands-free service starts.
Modified from patch submitted by Nitin Arora <niarora@codeaurora.org>.
Bug:
20481584
Change-Id: I78d62329aa5e4113c72fac2d40efa671442bae2d
Andre Eisenbach [Wed, 22 Apr 2015 22:38:21 +0000 (15:38 -0700)]
Reduce log spam on TX queue congestion
Bug:
19544388
Change-Id: Ib16878c08345983b3f72b484f2d5e4eb4791f2f9
The Android Automerger [Wed, 22 Apr 2015 13:45:28 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18
Andre Eisenbach [Wed, 22 Apr 2015 04:27:38 +0000 (04:27 +0000)]
Merge "Initialize white list size after stack reset"
Andre Eisenbach [Tue, 21 Apr 2015 04:46:37 +0000 (21:46 -0700)]
Fix A2DP source double initialization problem
Fixed a problem where A2DP source was initialized twice. Once before
btif was properly initialize and then a second time when the JNI
requests A2DP to be initialized, which would then fail.
Change-Id: Ia5f10a5bda344fe3bd66818a302b6b3f9db32a20
The Android Automerger [Tue, 21 Apr 2015 13:45:55 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18
Priti Aghera [Sat, 18 Apr 2015 01:11:24 +0000 (18:11 -0700)]
Initialize white list size after stack reset
The white list size is not currently set correctly, preventing devices
from being added to the LE whitelist, thus completely breaking
re-connects.
This fixes the white list management and propagates the correct reason
code for HID close events to make sure a device is re-added to the white
list if necessary.
Bug:
20290744
Change-Id: I46d7254ff3568c9964688cb192b9deb6b7d3062d
The Android Automerger [Mon, 20 Apr 2015 13:51:05 +0000 (06:51 -0700)]
merge in m-wireless-internal-release history after reset to
00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18
Ian Coolidge [Fri, 17 Apr 2015 06:09:29 +0000 (06:09 +0000)]
Merge "Fix missing includes under glibc on new code." into m-wireless-dev
Ian Coolidge [Fri, 17 Apr 2015 06:09:12 +0000 (06:09 +0000)]
Merge "Make unused tagging consistent, using the portable macro." into m-wireless-dev
Ian Coolidge [Fri, 17 Apr 2015 06:08:43 +0000 (06:08 +0000)]
Merge "Make inline functions static also." into m-wireless-dev
Ian Coolidge [Thu, 16 Apr 2015 20:50:46 +0000 (13:50 -0700)]
Fix missing includes under glibc on new code.
Change-Id: I2451f782ce3f51147ebaddc559c616eac0a2b7d9
Ian Coolidge [Fri, 17 Apr 2015 00:36:02 +0000 (17:36 -0700)]
Make unused tagging consistent, using the portable macro.
Change-Id: Id3b68bd32edfce13a847eef55ae81cd47e8fc112
Ian Coolidge [Thu, 16 Apr 2015 21:07:25 +0000 (14:07 -0700)]
Make inline functions static also.
inline is a hint, visibility should be limited in case
these are not inlined.
Change-Id: I07e66fd02d33ff58ebb50d226ff9b36c562445c8
Ian Coolidge [Thu, 16 Apr 2015 22:43:36 +0000 (15:43 -0700)]
Fix compilation when BLE_PRIVACY_SPT is false.
Change-Id: I3cd3eb11e479dd00ab98dc7c72bc7fd15c009e4f
Mark Salyzyn [Thu, 16 Apr 2015 18:13:39 +0000 (11:13 -0700)]
bluedroid: compile error hammerhead-userdebug_clang
- This was a clang complaint, not a gcc complaint
- memset event to be portable to all compile environments
- error as follows:
external/bluetooth/bluedroid/osi/./src/reactor.c:90:34:
error: missing field data initializer [-Werror,-Wmissing-field-initializers]
struct epoll_event event = { 0 };
^
external/bluetooth/bluedroid/osi/./src/reactor.c:151:34:
error: missing field data initializer [-Werror,-Wmissing-field-initializers]
struct epoll_event event = { 0 };
^
external/bluetooth/bluedroid/osi/./src/reactor.c:174:34:
error: missing field data initializer [-Werror,-Wmissing-field-initializers]
struct epoll_event event = { 0 };
^
3 errors generated.
make: *** [out/target/product/hammerhead/obj/STATIC_LIBRARIES/libosi_intermediates/./src/reactor.o] Error 1
Change-Id: I14b884cf1665c68aff1e5afd3df65ac10af474d2
The Android Automerger [Thu, 16 Apr 2015 13:45:36 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
ca8e356bebe608310ce50d0cbc5c821a694554a9
Andre Eisenbach [Thu, 16 Apr 2015 00:56:03 +0000 (17:56 -0700)]
Fix LE pairing
Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f
Priti Aghera [Thu, 18 Dec 2014 21:55:48 +0000 (13:55 -0800)]
LE Data Packet Extension support
Included support for LE data packet extension feature according
to BT 4.2 spec. This patch checks if the controller supports LE
packet extension and provides functions to set the PDU length.
Bug:
20013956
Change-Id: I6a92970fede2f793ad48c9fa2e0247ad00297533
Casper Bonde [Tue, 7 Apr 2015 09:05:07 +0000 (11:05 +0200)]
Add support for Bluetooth Sim Access Profile (1/4)
Change-Id: Ie1dd95ee00976255f74b6747a1d3fc3ed59152f3
Sharvil Nanavati [Tue, 14 Apr 2015 19:01:55 +0000 (12:01 -0700)]
Add a section in style guide: __func__ should be used over __FUNCTION__.
Change-Id: I93eb3e512b6030818b06a63f13999bd45dcfec4e
Andre Eisenbach [Thu, 16 Apr 2015 05:16:47 +0000 (22:16 -0700)]
Fix compilation error with privacy disabled
Change-Id: I06d1322789fbd547080a6bd64e9c7153ddb6d70e
Andre Eisenbach [Thu, 16 Apr 2015 00:56:03 +0000 (17:56 -0700)]
Fix LE pairing
Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f
Vinit Deshpande [Wed, 15 Apr 2015 20:02:58 +0000 (13:02 -0700)]
Fix build issues after the merge
Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
Priti Aghera [Thu, 18 Dec 2014 21:55:48 +0000 (13:55 -0800)]
LE Data Packet Extension support
Included support for LE data packet extension feature according
to BT 4.2 spec. This patch checks if the controller supports LE
packet extension and provides functions to set the PDU length.
Bug:
20013956
Change-Id: I6a92970fede2f793ad48c9fa2e0247ad00297533