OSDN Git Service
Arman Uguray [Fri, 29 May 2015 22:10:45 +0000 (15:10 -0700)]
gn-build: Get //utils:utils to compile
This CL conditionally removes the dependency on libcutils to get the
//utils:utils static library target to compile in GN. This technically breaks
the functionality on non-Android platforms until we come up with a common way to
make the logic work.
BUG=
21339022
Change-Id: I47cd8f7991942dbe43a577cef1f95626560f7f72
Arman Uguray [Fri, 29 May 2015 22:07:51 +0000 (15:07 -0700)]
gn-build: Get //stack:stack to compile
This CL adds a missing include to get the //stack:stack target to compile.
BUG=
21339022
Change-Id: Ie41816514c97ddcb1e4f1f0b9481364a563d8b9b
Arman Uguray [Fri, 29 May 2015 22:01:38 +0000 (15:01 -0700)]
gn-build: Get HCI and net_test_hci to compile
This CL fixes the HCI module so that the HCI static library and the net_test_hci
unit test can be compiled using GN + ninja.
BUG=
21339022,
21444689
Change-Id: If3d8649b25297880e5e674a2026badb1b0e01fee
Arman Uguray [Fri, 29 May 2015 21:43:20 +0000 (14:43 -0700)]
gn-build: Clean up GN files
Removed unnecessary library and include flags from build files. To make the
initial build outputs more similar to Android, this CL changes the usage of the
GN "source_set" idiom to "static_library". This comes at a performance loss
while keeping the builds similar until we get the whole stack to compile.
BUG=
21339022
Change-Id: I46f70b3b64b2537634a1dbb517a5168566230efb
Arman Uguray [Fri, 29 May 2015 21:30:42 +0000 (14:30 -0700)]
gn-build: Add tinyxml2 as a secondary source
Added tinyxml2 as a secondary source. Moved //build/secondary/testing to
//build/secondary/third_party in the process. This means that all third_party
sources (gtest, tinyxml2) should be placed in a top-level third_party directory.
BUG=
21339022
Change-Id: If324ef1eb0d5061e005f62a80d23fef25e7e78a4
Marie Janssen [Wed, 27 May 2015 19:36:23 +0000 (12:36 -0700)]
build: Build net_test_btcore using GN + ninja
Changes needed:
- add gtest dependency
- add includes to allow build on Goobuntu Trusty
Bug:
21444625
Change-Id: Ic2495258681c6b93de8d4ddb5dfff2c24248b979
Arman Uguray [Fri, 29 May 2015 21:46:30 +0000 (14:46 -0700)]
gn-build: Add missing global compiler flags
This CL introduces compiler flags that enable stripping of unused symbols out of
static libraries at the linking stage. This is used by the Android build to keep
module dependencies small while building specialized executables (such as unit
tests).
Also added a preprocessor definition for the EXPORT_SYMBOL macro, recently
introduced by icoolidge@.
BUG=
21339022
Change-Id: I7d3f9f64abc1f4e080196c18ccb893443ee1b64a
Ian Coolidge [Thu, 28 May 2015 16:45:38 +0000 (16:45 +0000)]
Merge "Fix use-after-free while setting advertisement data."
Ian Coolidge [Tue, 21 Apr 2015 23:25:08 +0000 (16:25 -0700)]
Set default symbol visibility to 'hidden'.
Bug:
20427982
Change-Id: I003469d6dfce681a38baa71b5709236a1a4a2189
Ian Coolidge [Thu, 21 May 2015 02:59:10 +0000 (19:59 -0700)]
Fix use-after-free while setting advertisement data.
Producer context was freeing data buffers without
performing a deep copy on the passed structure.
Also added some const correctness so we can reason
about the state of btif_adv_data_t as its data
gets associated with the advertising instance.
Bug:
21343750
Change-Id: Ifea0209e8426b61d8456c299c836ba640bd30f31
Arman Uguray [Thu, 21 May 2015 20:52:25 +0000 (13:52 -0700)]
build: Build net_test_osi using GN + ninja
This CL adds support to build the net_test_osi target using GN + ninja.
The BUILD.gn file now pulls in gtest as a dependency. Missing libc
includes have been added to sources that prevented compilation on
Goobuntu (14.04).
The osi/include/log.h header has been modified to conditionally call the
Android log utilities vs plain-old printf on non-Android builds.
BUG=
21339022
Change-Id: If3c356360c56c63b3bf551b41dc8d3269d8e7e09
Arman Uguray [Thu, 21 May 2015 20:39:18 +0000 (13:39 -0700)]
build: Add build arguments for libhardware and core dirs
This patch adds GN arguments to add libhardware and core library include
paths in a generic manner.
Example args.gn file:
libhw_include_path = "../../libhardware/include"
core_include_path = "../../core/include"
Also introduced in this CL is the "OS_GENERIC" preprocessor define, that
will allow us to conditionally compile Android-specific vs generic code
until we shed the Android-specific dependencies.
BUG=
21339022
Change-Id: I42b1cc501738653a6e886a0365c9cbef2e9a525e
Arman Uguray [Thu, 21 May 2015 20:20:01 +0000 (13:20 -0700)]
build: Add gtest as a secondary source
As a temporary solution, this CL introduces gtest as a secondary build
source. For now, gtest can be included in testonly targets as a direct
GN target dependency, by placing the gtest source under "testing/gtest"
at the root of the tree.
Moving forward, we can use solutions like gclient to pull in external
dependencies such as gtest, or we can depend on it being available on
the system.
BUG=
21339022,
21340407
Change-Id: I80ab3a81a53d7c29d54857a8d0cd9677fed77549
Arman Uguray [Tue, 26 May 2015 21:50:36 +0000 (14:50 -0700)]
build: Add missing copyright headers to new GN build files
BUG=
21339022
Change-Id: I946fad7bf8116054f9081e064748793e79a6f85a
Scott James Remnant [Thu, 21 May 2015 17:28:22 +0000 (17:28 +0000)]
Merge "Initial attempt at a GN/Ninja-based build system"
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
Scott James Remnant [Tue, 12 May 2015 20:58:49 +0000 (13:58 -0700)]
Initial attempt at a GN/Ninja-based build system
BUG=
20491586
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
Chih-Hung Hsieh [Mon, 11 May 2015 21:02:26 +0000 (21:02 +0000)]
Merge "Work around clang/llvm compilation problems."
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)
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
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
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
The Android Automerger [Wed, 15 Apr 2015 13:45:34 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
3676653d4d6ba02235d092b07dafcc3c97126d8a
Vinit Deshpande [Tue, 14 Apr 2015 23:00:10 +0000 (16:00 -0700)]
am
f29a2fb..
e07ad10 from mirror-m-wireless-internal-release
e07ad10 merge in m-wireless-internal-release history after reset to
d232721ae5e5b6949a5249f0d116408b8a3c5f1d
d232721 L2CAP socket - fix merge errors
899b771 BR/EDR secure connections support
7fb0da6 Support numeric comparison in SMP
aa351f2 merge in m-wireless-internal-release history after reset to
399e89150b3df87172bdf92d54712b379324b149
399e891 Fix for AVRCP CTRL stops sending pass through command
daddea9 Free Avrcp Controller callbacks on Cleanup
764babe Protect reset of out stream with mutex
444a8da LE Privacy 1.2 and LE secure connections
8372aa5 L2CAP and SDP Search API for BT profiles (2/2)
fd422a7 Update Service Availability.
2a0652a merge in m-wireless-internal-release history after reset to
0b47e0a35c16f5b7d77c30ec1c095ed92ff4fd74
78d0f4c merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
0b47e0a Avoid duplicate disconnection callbacks for fixed channel connections
5646973 Add a section on assertions to the style guide.
d768767 Merge "Avoid null-pointer dereference in l2c_release_lcb()" into m-wireless-dev
ef92b53 Avoid null-pointer dereference in l2c_release_lcb()
4bf68bf merge in m-wireless-internal-release history after reset to
f538707fe64c62b1dbb8e4210e4a1bfa0bab2b56
de6ac86 Add a 'Bluedroid conventions' section to the style guide.
1b80439 Add a section to the style guide on variable declarations.
485f19e merge in m-wireless-internal-release history after reset to
4540f59bc447dc2b7b31a3e974b74a60b2417e7d
bef8940 merge in m-wireless-internal-release history after reset to
841c9103cad1898ceca87b734acd4d4537f9f452
ab4c38c merge in m-wireless-internal-release history after reset to
a7e698f5a9e062f62e21bc435643975c30bab846
2807a74 merge in m-wireless-internal-release history after reset to
a7e698f5a9e062f62e21bc435643975c30bab846
99dbe9a merge in m-wireless-internal-release history after reset to
78c0b060f29b7b7014adddb2f98bf6ae9755c488
f7f8399 merge in m-wireless-internal-release history after reset to
a5371c238b4e874d8313ac56a23451e7345ff541
3aa60d7 Make A2DP audio HAL a shared library again
3256a31 Move unused include file out of hci_audio.h
b866b69 Add option for schedule_next_instance to force rescheduling
4ae5e3e Ensure alarms are called back when they expire in the past
a7bd03e Rewrite alarms to use a single posix timer instance
88e7b15 Resolved hardware error observed during SCO Connection setup
Change-Id: Ib9a0a2ffca1d4811a9a9e56674bf43275d8b2205
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
The Android Automerger [Tue, 14 Apr 2015 13:46:03 +0000 (06:46 -0700)]
merge in m-wireless-internal-release history after reset to
d232721ae5e5b6949a5249f0d116408b8a3c5f1d
Casper Bonde [Mon, 13 Apr 2015 19:58:56 +0000 (21:58 +0200)]
L2CAP socket - fix merge errors
This fixes a few changes that was reverted by mistake,
causing uninitialized data to be used as instance data
in GAP and no buffers allocated to the L2CAP sockets.
Change-Id: I060c5faf602c1dedcc34b4acd1417949820a4da4
Mudumba Ananth [Fri, 30 Jan 2015 10:33:02 +0000 (02:33 -0800)]
BR/EDR secure connections support
As a part of BT 4.1 stack upgrade, added host support for BR/EDR
secure connections to be able to interact with controllers that
support secure connections and upgrade the SSP mechanism to use
secure connection rules.
This change checks for controller support in the extended_features
(LMP page 2) and then declares the host support (extended_features
LMP page 1) using WRITE SECURE CONNECTIONS HOST SUPPORT.
If both the sides support secure connections, the simple pairing
process utilizes the link key generated using P-256 elliptic curve
(in the controller) and both the sides will be
in a secure connection.
Bug:
19289699
Change-Id: Idb3c41f439973bea137f5a4a69468c1f55aecbd7
Satya Calloji [Fri, 30 Jan 2015 04:40:17 +0000 (20:40 -0800)]
Support numeric comparison in SMP
Enable support for numeric comparison in SMP when LE Secure connection
is supported. The change will distinguish between passkey confirmation
in case of Security grant and Passkey confirm.
Original author: Priti Aghera <paghera@broadcom.com>
Bug:
19816438
Change-Id: Id1fd072d1e567a80b020b4ba217486c3308ad39d
The Android Automerger [Mon, 13 Apr 2015 13:45:29 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
399e89150b3df87172bdf92d54712b379324b149
Anubhav Gupta [Fri, 5 Sep 2014 22:45:36 +0000 (15:45 -0700)]
Fix for AVRCP CTRL stops sending pass through command
Issue is due to BTA_AV_REMOTE_RSP_EVT is not handled in btif_av
handler. Swtich case added to handle remote response event in
btif_av_opened_handler and btif_av_started_handler.
Change-Id: I58a7bd8bfe5b07a7339d93d2b66928131836d431
Anubhav Gupta [Mon, 8 Sep 2014 10:30:22 +0000 (16:00 +0530)]
Free Avrcp Controller callbacks on Cleanup
Free AVRCP Controller callbacks on cleanup so that callbacks
are initialized properly on next initialization.
Change-Id: Ieaf4c1989a7c40c591adfb7cb47912532ceee46e
Nitin Srivastava [Mon, 22 Dec 2014 14:24:09 +0000 (19:54 +0530)]
Protect reset of out stream with mutex
Protect reset of out stream with mutex so that the access
of the same is properly synchronized in multi-threaded environment.
Change-Id: I6dd81d8c7fa219ee8d1e4d82aa1e7ec52dcecec8
Satya Calloji [Fri, 6 Mar 2015 18:38:22 +0000 (10:38 -0800)]
LE Privacy 1.2 and LE secure connections
Bug:
19816438
Original author: Chaojing Sun <cjsun@broadcom.com>
Change-Id: I5951f4d4e038f8348a62aa6d19b2111bae0b3ecc
Kim Schulz [Wed, 25 Mar 2015 09:39:40 +0000 (10:39 +0100)]
L2CAP and SDP Search API for BT profiles (2/2)
Added support for exposing L2CAP to Java such that OBEX over L2CAP
is made possible.
Added support to create SDP records as a seperate step.(as opposed to
creating a SDP record when a BluetoothSocket is created).
This allows both a RFCOMM channel and a L2CAP PSM to be included in a
SDP record. (Additionally the content of the SDP record is set by the
profile in Java, in stead of beeing hardcoded in the socket layer.)
This completes the L2CAP channel exposure to Java.
Change-Id: Iaf68a07d910145cdd33e940d73cd680f79164100
Prerepa Viswanadham [Fri, 10 Apr 2015 20:48:17 +0000 (13:48 -0700)]
Merge commit '
4bf68bf020c7fd1aabcdc4b5d8f5fbb8bacdec9d' into merge_work
Change-Id: Ibc6d6e691b7f97611d16f96220346dfd6ffbbf52
Mallikarjuna GB [Wed, 5 Nov 2014 09:48:50 +0000 (15:18 +0530)]
Update Service Availability.
- service availability is updated on CIND response
during SLC set-up.
- update current service availability on +CIEV response from
remote device.
Change-Id: I57643a6ac3aad5339d686cf941902a8bf88d99fb
The Android Automerger [Thu, 9 Apr 2015 13:45:28 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
0b47e0a35c16f5b7d77c30ec1c095ed92ff4fd74
Ian Coolidge [Thu, 9 Apr 2015 11:19:41 +0000 (11:19 +0000)]
am
dd6401d1: am
c685480e: Don\'t truncate the top 16 bits of the LE advertisement data mask.
* commit '
dd6401d136fe50e0934147c1dacd9f0d89c03ede':
Don't truncate the top 16 bits of the LE advertisement data mask.
Ian Coolidge [Thu, 9 Apr 2015 11:01:05 +0000 (11:01 +0000)]
am
c685480e: Don\'t truncate the top 16 bits of the LE advertisement data mask.
* commit '
c685480ede429b016d4f5fcfbf91a621c400bfc9':
Don't truncate the top 16 bits of the LE advertisement data mask.
Ian Coolidge [Wed, 4 Mar 2015 01:00:17 +0000 (17:00 -0800)]
Don't truncate the top 16 bits of the LE advertisement data mask.
This is stored elsewhere as unsigned 32-bit integer.
It should be stored the same way here.
Bug:
19592970
Change-Id: I34136ca76e56f9a5cd896138c947c46e7912d40a
(cherry picked from commit
91f6987ecca884b0995b77fea014046b8a56385a)
The Android Automerger [Thu, 9 Apr 2015 06:54:18 +0000 (23:54 -0700)]
merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
Satya Calloji [Tue, 17 Mar 2015 20:12:01 +0000 (13:12 -0700)]
Avoid duplicate disconnection callbacks for fixed channel connections
Fixed channel connections are getting a disconnect callback when the
HCI command is issued and when the HCI disconnect completes. This
causes problems if the upper layer trying to reconnect at link
disconnecting state.
Triggering the disconnect callback only once solves this problem.
Original author: Chaojing Sun <cjsun@broadcom.com>
Bug:
19816438
Change-Id: Ib661c968e586975a7fc7244e2d0745f71d52e3e9
Sharvil Nanavati [Wed, 8 Apr 2015 06:22:08 +0000 (23:22 -0700)]
Add a section on assertions to the style guide.
Change-Id: I5627b5b2d6b25f0472c53b8150b14bab79b200c3
Andre Eisenbach [Wed, 8 Apr 2015 21:00:18 +0000 (21:00 +0000)]
Merge "Fix init sequence for BT AV sink."
Rakesh Iyer [Wed, 8 Apr 2015 19:25:37 +0000 (12:25 -0700)]
Fix init sequence for BT AV sink.
BTA_AvEnable_Sink() was being called to early causing
a crash loop when the BT AV_SINK was included. This patch
changes up the init sequence to match that of the av
source. Also, rename a few constants for clarity.
Change-Id: I3e6a7e22a2643eeceb4afc082979d1d9967b0b99
Andre Eisenbach [Wed, 8 Apr 2015 18:11:54 +0000 (18:11 +0000)]
Merge "Avoid null-pointer dereference in l2c_release_lcb()" into m-wireless-dev
Andre Eisenbach [Wed, 8 Apr 2015 17:01:56 +0000 (10:01 -0700)]
Avoid null-pointer dereference in l2c_release_lcb()
Change-Id: Id46d678e45797c4d3d3c8e024f42cfd06b1d2da2
The Android Automerger [Wed, 8 Apr 2015 13:45:23 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to
f538707fe64c62b1dbb8e4210e4a1bfa0bab2b56
Sharvil Nanavati [Wed, 8 Apr 2015 06:10:59 +0000 (23:10 -0700)]
Add a 'Bluedroid conventions' section to the style guide.
Also introduce a memory management section underneath 'Bluedroid
conventions' that describes common ownership semantics.
Change-Id: I9f1f148437fe21788618bcdc884b2eea5cbff141