OSDN Git Service
Myles Watson [Fri, 21 Oct 2016 16:09:14 +0000 (16:09 +0000)]
btif: Apply clang-format am:
6bd442f543
am:
b6e056832f
Change-Id: I01814fd045b029d5d7599e61072014c70418eea8
Myles Watson [Fri, 21 Oct 2016 16:00:14 +0000 (16:00 +0000)]
btif: Apply clang-format
am:
6bd442f543
Change-Id: I06292eb468ed8e063f90792f08cce7e2249dcd7e
Myles Watson [Wed, 19 Oct 2016 16:50:22 +0000 (09:50 -0700)]
btif: Apply clang-format
clang-format doesn't understand block quotes of this form:
/* This is not handled well
** because there are two asterisks
**/
cd btif/
# Replace '**' at the beginning of the line with ' *'
sed 's/^[*][*]/ \*/' -i include/* src/* test/* co/*
clang-format --style=file -i src/* include/* test/* co/*
Test: mma -j32
Change-Id: I2477eae5480602d5b2fee5ec89c9ed7888022341
Jakub Pawlowski [Thu, 20 Oct 2016 22:30:24 +0000 (22:30 +0000)]
Merge "Various small warning/build fixes for Linux" am:
ed82cc2e6c
am:
ea9c52207c
Change-Id: I29bdc195c759a43cd3a7d111649029b96931987b
Andre Eisenbach [Thu, 20 Oct 2016 22:24:34 +0000 (15:24 -0700)]
Fix merge error; duplicate BTM_SecClearSecurityFlags
Test: compiles
Change-Id: Ifbe5b7e3a67690789dfa7d92e0c4235dddf193a6
Jakub Pawlowski [Thu, 20 Oct 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Various small warning/build fixes for Linux"
am:
ed82cc2e6c
Change-Id: Ic5dfc70bd83c86475dee16062563a02ae932888c
Treehugger Robot [Thu, 20 Oct 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Various small warning/build fixes for Linux"
Jacky Cheung [Thu, 20 Oct 2016 21:43:25 +0000 (21:43 +0000)]
Merge "DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability" into cw-f-dev
am:
67560541dd -s ours
Change-Id: I3bc4380d5604137577a5cf9dea838f8ab6b1b7ab
Jacky Cheung [Thu, 20 Oct 2016 21:29:39 +0000 (21:29 +0000)]
DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability
am:
0cb0e9346d -s ours
Change-Id: Ia06cb0da3e523da97dcc226f247ef8cbdb39d9ea
Andre Eisenbach [Thu, 20 Oct 2016 20:50:48 +0000 (20:50 +0000)]
Reset device security flags when pairing fails am:
667e1fe3d7
am:
c5c4730537
Change-Id: Ia55ed4ea0089e5bd23d375367aaa311b75b570b3
Andre Eisenbach [Thu, 20 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Reset device security flags when pairing fails am:
415d112056
am:
d3f71beec7
Change-Id: I613473f665f387cf5ac0f85e0bfafbddc03882a9
Jacky Cheung [Thu, 20 Oct 2016 20:42:05 +0000 (20:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability" into cw-f-dev
Andre Eisenbach [Thu, 20 Oct 2016 20:41:17 +0000 (20:41 +0000)]
Reset device security flags when pairing fails
am:
415d112056
Change-Id: If584eba5a0b31c2857908eb01c77372b53e9b349
Andre Eisenbach [Thu, 20 Oct 2016 20:33:35 +0000 (20:33 +0000)]
Reset device security flags when pairing fails
am:
667e1fe3d7
Change-Id: I1dd2d6d1a3f1dd613ae6d02d167f4fd7e015aadf
Andre Eisenbach [Tue, 18 Oct 2016 00:32:45 +0000 (17:32 -0700)]
Reset device security flags when pairing fails
Bug:
29998634
Test: manual
Change-Id: Icd9a76a065de147372df060c0b9555c75bcf46bc
Andre Eisenbach [Tue, 18 Oct 2016 00:32:45 +0000 (17:32 -0700)]
Reset device security flags when pairing fails
Bug:
29998634
Test: manual
(cherry picked from commit
54ee9431e8bf0ec1c47d7306fd7a3d0975590733)
Change-Id: I8bd0ce5b797e30009260f7fe673f389d066db9ac
Jakub Pawlowski [Thu, 20 Oct 2016 17:19:50 +0000 (10:19 -0700)]
Various small warning/build fixes for Linux
Test: build with ninja
Change-Id: Ic0f4d23e4a56a42be6e660f2afec83400ea6daa6
Jakub Pawlowski [Thu, 20 Oct 2016 15:55:07 +0000 (15:55 +0000)]
Various small fixes for Linux build am:
029a43b78e
am:
2c9bd8d049
Change-Id: Iea55c43b541557804b7cd17eff9dd2721c2c8c4e
Jakub Pawlowski [Thu, 20 Oct 2016 15:47:22 +0000 (15:47 +0000)]
Various small fixes for Linux build
am:
029a43b78e
Change-Id: Ie75a6f935ee4071cf5d0431ce6168fda9947d411
Jakub Pawlowski [Thu, 20 Oct 2016 06:31:13 +0000 (23:31 -0700)]
Various small fixes for Linux build
* add "-latomic" which was missing since we moved to clang
* empty LOG_EVENT_INT stub added for Linux
* add link libraries to fix stack_unittest
* add missing headers
Test: build with ninja
Change-Id: I1fe0b0b615db1da5ad083c162cb207b08979ce15
Jakub Pawlowski [Thu, 20 Oct 2016 02:00:33 +0000 (02:00 +0000)]
Move libhardware dependency to third_party folder on Linux am:
d550019746
am:
9594fb0b2c
Change-Id: I5b26d6955a86eb4f2ac2059f73c7b9d6d78f4d35
Jakub Pawlowski [Thu, 20 Oct 2016 01:52:32 +0000 (01:52 +0000)]
Move libhardware dependency to third_party folder on Linux
am:
d550019746
Change-Id: I270320ff6231af46b3f38d6e96ab8e95bfb236da
Jakub Pawlowski [Thu, 20 Oct 2016 01:35:18 +0000 (18:35 -0700)]
Move libhardware dependency to third_party folder on Linux
Thanks to this change we no longer have to configure paths by hand
Test: build with ninja
Change-Id: I04dfaa8f16e52a25efcc241019bae40d4201fb8b
Jacky Cheung [Wed, 19 Oct 2016 21:59:06 +0000 (14:59 -0700)]
DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability
Force the first bond to use Just Works pairing when
WEAR_LE_IO_CAP_OVERRIDE is set to TRUE.
Bug:
32234733
Change-Id: I1732be86dd888586c603112fb6c3010974b54a13
Myles Watson [Wed, 19 Oct 2016 22:22:20 +0000 (22:22 +0000)]
osi: Apply clang-format am:
b55040cc64
am:
70b475f04c
Change-Id: I2972ca5224e597c65e70177ebb8c581455350b34
Myles Watson [Wed, 19 Oct 2016 22:14:19 +0000 (22:14 +0000)]
osi: Apply clang-format
am:
b55040cc64
Change-Id: Ie27561c10d215e7c64b518402c529ec40908a485
Myles Watson [Wed, 19 Oct 2016 20:15:34 +0000 (13:15 -0700)]
osi: Apply clang-format
cd osi/
clang-format -i --style=file include/*.h include/socket_utils/* src/*.cc \
src/socket_utils/* src/protos/* test/*
Test: mma -j32
Change-Id: I659e586076f1e2ec8f687cd33f441700b8d1f823
Jakub Pawlowski [Wed, 19 Oct 2016 19:25:09 +0000 (19:25 +0000)]
Get rid of dependency on core from linux build (1/2) am:
b08fbbf106
am:
8daa669c68
Change-Id: If1cdbb864b4bba772c96df030045ba7f4a45cccd
Jakub Pawlowski [Wed, 19 Oct 2016 19:18:18 +0000 (19:18 +0000)]
Get rid of dependency on core from linux build (1/2)
am:
b08fbbf106
Change-Id: I06f6701477859f3e02c2b76279bde9d673c53d2e
Jakub Pawlowski [Wed, 19 Oct 2016 03:22:14 +0000 (20:22 -0700)]
Get rid of dependency on core from linux build (1/2)
When building bluetooth stack for linux, don't include dependencies from
core.
Test: build with ninja and mma
Change-Id: I02aeb178327c9f6c0414cc37624aecc58fb0876e
Pavlin Radoslavov [Wed, 19 Oct 2016 07:25:26 +0000 (07:25 +0000)]
Merge "Abstract the adjustment of A2DP codec parameters" am:
425a8cfa39
am:
94ba9af34a
Change-Id: I9dcb8ddc0747e431dd86d648d5c365b1b925533a
Pavlin Radoslavov [Wed, 19 Oct 2016 07:16:56 +0000 (07:16 +0000)]
Merge "Abstract the adjustment of A2DP codec parameters"
am:
425a8cfa39
Change-Id: I26f82041d6273f05d797ccd4309760a11d1d48c2
Treehugger Robot [Wed, 19 Oct 2016 07:11:14 +0000 (07:11 +0000)]
Merge "Abstract the adjustment of A2DP codec parameters"
Jakub Pawlowski [Wed, 19 Oct 2016 04:38:17 +0000 (04:38 +0000)]
Remove Android a2dp bridge from generic build configuration am:
5baa875baa
am:
a1745f3b0c
Change-Id: I70608228f4850ef0088f9dc04b09eb0356fb15e0
Jakub Pawlowski [Wed, 19 Oct 2016 04:30:46 +0000 (04:30 +0000)]
Remove Android a2dp bridge from generic build configuration
am:
5baa875baa
Change-Id: I6ace10e7d598db1e00f30edf3356f2e5df7e8fb8
Jakub Pawlowski [Wed, 19 Oct 2016 01:45:21 +0000 (18:45 -0700)]
Remove Android a2dp bridge from generic build configuration
Code in audio_a2dp_hw folder contains Android-specific code for talking
to Android media libraries. It is not useful on other platforms, and
only adds unnecessary dependencies.
Test: compile with ninja
Change-Id: Ia0313332b4456ba0287587da66cdf2cce045f89c
Pavlin Radoslavov [Wed, 19 Oct 2016 00:19:55 +0000 (17:19 -0700)]
Abstract the adjustment of A2DP codec parameters
Replaced hard-coded SBC-specific hack for updating some
of its parameters with an API abstraction: A2DP_AdjustCodec()
Also, added the corresponding unit tests.
Bug:
30958229
Test: manual A2DP testing, added new unit tests
Change-Id: I51a0a019d107362f9c24829408d426a5403b0a8e
Jakub Pawlowski [Wed, 19 Oct 2016 01:03:16 +0000 (01:03 +0000)]
Merge "Use the default LE connection timeout if the remote device has no preference" am:
18ab8cc580
am:
c6e6e15434
Change-Id: Idaea5de107eda5e5afa2846da545ae710f6e2ddb
Jakub Pawlowski [Wed, 19 Oct 2016 00:55:46 +0000 (00:55 +0000)]
Merge "Use the default LE connection timeout if the remote device has no preference"
am:
18ab8cc580
Change-Id: I23f0cda113f5d943e2f97f507314ca897deacb4a
Treehugger Robot [Wed, 19 Oct 2016 00:50:29 +0000 (00:50 +0000)]
Merge "Use the default LE connection timeout if the remote device has no preference"
Andre Eisenbach [Wed, 19 Oct 2016 00:41:32 +0000 (00:41 +0000)]
Merge "Remove unused task IDs" am:
2a7c083e7e
am:
3d2badc7c1
Change-Id: I09a7c9fa16c77a8ae2cbaf1ca4a902e52909c62b
Andre Eisenbach [Wed, 19 Oct 2016 00:35:32 +0000 (00:35 +0000)]
Merge "Remove unused task IDs"
am:
2a7c083e7e
Change-Id: Ifdbfc60ddaf38aa5ab81de62be52b9a971cade35
Treehugger Robot [Wed, 19 Oct 2016 00:30:01 +0000 (00:30 +0000)]
Merge "Remove unused task IDs"
Jakub Pawlowski [Tue, 18 Oct 2016 21:56:00 +0000 (14:56 -0700)]
Use the default LE connection timeout if the remote device has no preference
Change-Id: I03f022b6f18c7d1ec7f139a7d67fd60ec6f15ba2
Pavlin Radoslavov [Tue, 18 Oct 2016 21:00:17 +0000 (21:00 +0000)]
Merge "Add the appropriate statement to "case:" without "break"" am:
43b6bd3af7
am:
5b0705fe9b
Change-Id: I40f027b369309e71896bef09c958c8f0102460b8
Andre Eisenbach [Tue, 18 Oct 2016 21:00:05 +0000 (21:00 +0000)]
Merge "Remove GAP_CONN_POST_EVT_INCLUDED" am:
95f9af3e65
am:
0ca0b0d491
Change-Id: Ide975d38269bca07a781220fb81ee08860cfc77f
Pavlin Radoslavov [Tue, 18 Oct 2016 20:53:03 +0000 (20:53 +0000)]
Merge "Add the appropriate statement to "case:" without "break""
am:
43b6bd3af7
Change-Id: I930944124ac86923dfff57fca50e71353b37c2d3
Andre Eisenbach [Tue, 18 Oct 2016 20:52:53 +0000 (20:52 +0000)]
Merge "Remove GAP_CONN_POST_EVT_INCLUDED"
am:
95f9af3e65
Change-Id: I220a092683643611acb3a5fb00952fea653d4c61
Treehugger Robot [Tue, 18 Oct 2016 20:48:22 +0000 (20:48 +0000)]
Merge "Add the appropriate statement to "case:" without "break""
Treehugger Robot [Tue, 18 Oct 2016 20:44:08 +0000 (20:44 +0000)]
Merge "Remove GAP_CONN_POST_EVT_INCLUDED"
Jakub Pawlowski [Tue, 18 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Linux build fix am:
4d237f22c0
am:
be006d631c
Change-Id: I15d1c209d7050909bf4af5c230c3cf75a64af6fa
Jakub Pawlowski [Tue, 18 Oct 2016 20:10:19 +0000 (20:10 +0000)]
Linux build fix
am:
4d237f22c0
Change-Id: I93415a4f4c1017f4b276c6c3fcf1d2f5ee0476bf
Andre Eisenbach [Tue, 18 Oct 2016 19:16:07 +0000 (12:16 -0700)]
Remove unused task IDs
Test: compiles
Change-Id: I0a16498d82d12e1b7597290e8b778efb5a7b3906
Andre Eisenbach [Tue, 18 Oct 2016 18:58:57 +0000 (11:58 -0700)]
Remove GAP_CONN_POST_EVT_INCLUDED
Also removed last usage of a GKI_* function.
Test: compiles
Change-Id: If9f8beca5d8485b363027fd64ac4005e9e499721
Jakub Pawlowski [Tue, 18 Oct 2016 18:00:05 +0000 (18:00 +0000)]
Add clang configuration for ninja build scripts am:
e28785321b
am:
1392972412
Change-Id: Ife78bd545950144b3b28e5236ff0a3f06033c532
Jakub Pawlowski [Tue, 18 Oct 2016 17:54:10 +0000 (17:54 +0000)]
Add clang configuration for ninja build scripts
am:
e28785321b
Change-Id: Ie0fdc906d08abc88c28b11827fbe4a4f909e867d
Jakub Pawlowski [Tue, 18 Oct 2016 16:56:29 +0000 (09:56 -0700)]
Linux build fix
Test: compile using ninja
Pavlin Radoslavov [Tue, 18 Oct 2016 17:12:26 +0000 (10:12 -0700)]
Add the appropriate statement to "case:" without "break"
Test: code compilation
Change-Id: Ia43d7530a598a526764023c47bb20fdedda6fe64
Jakub Pawlowski [Tue, 18 Oct 2016 16:56:57 +0000 (09:56 -0700)]
Add clang configuration for ninja build scripts
Test: compile with ninja
Change-Id: I0f2ff28a03de05ea96bed5ba43eace9609d8deb0
Greg Kaiser [Tue, 18 Oct 2016 17:07:02 +0000 (17:07 +0000)]
btif_rc: Don't memset STL mutex objects am:
78965e88ee
am:
701c8caa2c
Change-Id: I9dc00c3ffce3ca87a25bfe935a2cb3fad3aff532
Greg Kaiser [Tue, 18 Oct 2016 17:00:01 +0000 (17:00 +0000)]
btif_rc: Don't memset STL mutex objects
am:
78965e88ee
Change-Id: Ib6aa1f0d60a60c3f660e2c1b3eade27b89e0abe7
Greg Kaiser [Tue, 18 Oct 2016 14:04:24 +0000 (07:04 -0700)]
btif_rc: Don't memset STL mutex objects
Switching to STL mutex/recursive_mutex objects left us with
code which memset these objects. These are opaque, and need to
be initialized/destroyed via constructors/destructors, not
through directly setting their memory.
We change our memset calls to only zero out the parts of the
structs which don't have these objects.
Test: Recompile
Change-Id: Idf666e935f4094ad4cfca7cdafa523f777a7e769
Pavlin Radoslavov [Tue, 18 Oct 2016 07:31:58 +0000 (07:31 +0000)]
Renamed most C files to C++: *.c to *.cc am:
b2a292b5d8
am:
9d296a94a2
Change-Id: I72bee673dadebb5472f2538dc3b01e4b3111e6f1
Pavlin Radoslavov [Tue, 18 Oct 2016 07:25:26 +0000 (07:25 +0000)]
Renamed most C files to C++: *.c to *.cc
am:
b2a292b5d8
Change-Id: I80a6e26de5db95ededa91adffa16c5da103a4f74
Pavlin Radoslavov [Sat, 15 Oct 2016 02:34:48 +0000 (19:34 -0700)]
Renamed most C files to C++: *.c to *.cc
Also:
- Fixed C++ related compilation errors.
- Added missing 'extern "C"' guards in some of the header files.
- Added missing LOCAL_CPP_EXTENSION to Android.mk files.
- Added-back btif/src/btif_mce.cc and bta/mce/bta_mce_* to
btif/Android.mk and bta/Android.mk respectively.
- Fixed the alphabetical ordering of the *.cc files in some
of the Android.mk files.
- Added missing Copyright header to "osi/include/list.h"
- Updated "osi/src/wakelock.cc" to use C++ std::string
instead of dynamic allocation of C-style strings.
Test: code compilation, unit tests, and A2DP streaming
Change-Id: Ia2f7215ed9df32775c701b68fc86b09875b942c7
Pavlin Radoslavov [Tue, 18 Oct 2016 05:09:48 +0000 (05:09 +0000)]
Removed obsoleted define statements from bt_target.h am:
3c196348ee
am:
6a9906bc05
Change-Id: I8563ee7ceeadb72a9e2b609a22e50e7693b8eced
Pavlin Radoslavov [Tue, 18 Oct 2016 05:02:47 +0000 (05:02 +0000)]
Removed obsoleted define statements from bt_target.h
am:
3c196348ee
Change-Id: I20af86287c83b4ba05e55a02776b9a3889229fc6
Pavlin Radoslavov [Tue, 18 Oct 2016 00:38:02 +0000 (17:38 -0700)]
Removed obsoleted define statements from bt_target.h
The removed statements were accidentally re-introduced
by an earlier CL that wasn't cherry-picked / rebased properly.
Test: code compilation.
Change-Id: I726a8df99c4a8e7af8130c0ca63306e67c4486c3
Mark Salyzyn [Tue, 18 Oct 2016 01:51:29 +0000 (01:51 +0000)]
Merge "Add various missing includes" am:
66e8c7aa14
am:
5d0bf84732
Change-Id: I2ddb363aa28c95fbd92dba8443e30f9582ce89e4
Mark Salyzyn [Tue, 18 Oct 2016 01:44:54 +0000 (01:44 +0000)]
Merge "Add various missing includes"
am:
66e8c7aa14
Change-Id: I741ade8b7054fcbca5d703f835c40a9db1148176
Treehugger Robot [Tue, 18 Oct 2016 01:38:08 +0000 (01:38 +0000)]
Merge "Add various missing includes"
Jakub Pawlowski [Tue, 18 Oct 2016 01:29:05 +0000 (01:29 +0000)]
Make advertising instance count part of the HCI interface am:
1dd7751088
am:
a5bf08921b
Change-Id: Id9d89b3a55e74be4c92e3cdfcf50f621efe97116
Jakub Pawlowski [Tue, 18 Oct 2016 01:22:04 +0000 (01:22 +0000)]
Make advertising instance count part of the HCI interface
am:
1dd7751088
Change-Id: I09eeb00aab9893068f62669cb42aaf7efc4b875f
Mark Salyzyn [Mon, 17 Oct 2016 16:43:39 +0000 (09:43 -0700)]
Add various missing includes
Test: Build errors
Bug:
30465923
Change-Id: Ib902d9d11d1f346d4dab0678d7f409f11a35c1b2
Jakub Pawlowski [Mon, 10 Oct 2016 21:25:52 +0000 (14:25 -0700)]
Make advertising instance count part of the HCI interface
The number of advertising instances will ultimately depend on the HCI
interface used. BleAdvertisingManagerImpl should not depend on a global
function for that.
Test: Covered by BleAdvertiseApiTest sl4a test
Bug:
30622771
Change-Id: I1399de3f4289708f7218eae9c00ac7372e4246db
Sanket Agarwal [Mon, 17 Oct 2016 21:37:54 +0000 (21:37 +0000)]
Implement AVRCP Controller (Client) Browsing. am:
e7bd890565
am:
5e3f53c61b
Change-Id: I2567ce43898f568fd96d114d73d8136c1adc429a
Pavlin Radoslavov [Mon, 17 Oct 2016 21:37:43 +0000 (21:37 +0000)]
Removed duplicate define of BT_HCI_UNKNOWN_MESSAGE_TYPE_NUM
am:
426de7f83c
Change-Id: If6f7d61737c716bd6442718cfac7a65c48424915
Sanket Agarwal [Mon, 17 Oct 2016 21:30:50 +0000 (21:30 +0000)]
Implement AVRCP Controller (Client) Browsing.
am:
e7bd890565
Change-Id: Ibd246c1de29b17a0cf3f11f7280bb9bdccd1c842
Pavlin Radoslavov [Mon, 17 Oct 2016 20:45:31 +0000 (13:45 -0700)]
Removed duplicate define of BT_HCI_UNKNOWN_MESSAGE_TYPE_NUM
Change-Id: I1487eb0a77aa8c92d70e3fbd931a6340e1e952f3
Sanket Agarwal [Wed, 11 May 2016 19:30:49 +0000 (12:30 -0700)]
Implement AVRCP Controller (Client) Browsing.
Following is included as part of the features:
a) Browsing for all 4 scopes (Media, VFS, Player and Now Playing)
b) Player selection and song selection from browse list.
The change constructs the following (from lower to upper protocol
layers):
1. AVCTP Browse (bta/ & stack/)
-- Connection Handling
-- Constructing browse commands
-- Parsing browse responses
2. AVRCP (btif/)
-- JNI interaction/API
-- Connection handling to Java
-- Delegating request and responses to Java
Bug:
28791287
Change-Id: Ibc97ded93cb9c469778ea1e37733390d561cd4cd
(cherry picked from commit
9ea8d07c9286a1f4d338dd64ee02266e324d28e5)
Pavlin Radoslavov [Sat, 15 Oct 2016 12:14:45 +0000 (12:14 +0000)]
Format A2DP-related code with clang-format am:
397e5a5d6a
am:
681f085bba
Change-Id: I04611d612a02420f2c90553d6631778e67b99806
Pavlin Radoslavov [Sat, 15 Oct 2016 12:10:16 +0000 (12:10 +0000)]
Format A2DP-related code with clang-format
am:
397e5a5d6a
Change-Id: I26e949b947ddf440fd71acfe24ef5740a7e3b13c
Pavlin Radoslavov [Sat, 15 Oct 2016 10:19:38 +0000 (10:19 +0000)]
Removed unused *_DYNAMIC_MEMORY conditional statements am:
37c1b5f8cc
am:
ba5455ff21
Change-Id: Iac2c236875a98c5f06f29d380c8245bd44df65d5
Pavlin Radoslavov [Sat, 15 Oct 2016 10:15:07 +0000 (10:15 +0000)]
Removed unused *_DYNAMIC_MEMORY conditional statements
am:
37c1b5f8cc
Change-Id: I8caeb3272c68f735428bfc5282688f6526db3367
Pavlin Radoslavov [Fri, 14 Oct 2016 23:13:54 +0000 (16:13 -0700)]
Format A2DP-related code with clang-format
clang-format -style=file -i stack/a2dp/a2dp_* stack/include/a2dp_* \
btif/include/btif_a2dp* btif/src/btif_a2dp*
Test: top-level compilation and running A2DP
Change-Id: I66f0a047192b783ac0147def480754daf617dd8d
Pavlin Radoslavov [Fri, 14 Oct 2016 22:47:27 +0000 (15:47 -0700)]
Removed unused *_DYNAMIC_MEMORY conditional statements
Test: compilation from the top-level directory
Change-Id: I181e6ae2e71c232ca0dc733dabda5cb0fc2672d8
Jakub Pawlowski [Sat, 15 Oct 2016 05:02:17 +0000 (05:02 +0000)]
Merge "Use proper types in SBC related code" am:
3a9119a909
am:
90471821ee
Change-Id: Id4eb1e6c280e78c7b868dea62b2e01b63e389873
Jakub Pawlowski [Sat, 15 Oct 2016 04:58:16 +0000 (04:58 +0000)]
Merge "Use proper types in SBC related code"
am:
3a9119a909
Change-Id: Ic358915630706a08305bb9264e3c0520dd0efb8e
Treehugger Robot [Sat, 15 Oct 2016 04:51:06 +0000 (04:51 +0000)]
Merge "Use proper types in SBC related code"
Jakub Pawlowski [Sat, 15 Oct 2016 00:14:16 +0000 (17:14 -0700)]
Use proper types in SBC related code
Use int32_t and int16_t instead of SINT32 and SINT16
Test: organoleptic assessment of audio quality from Android and Linux
Change-Id: Ia4d8a5f08163a90240382fd102082f5aab9611c5
Subramanian Srinivasan [Sat, 15 Oct 2016 00:47:59 +0000 (00:47 +0000)]
Merge "Add device record for BR/EDR devices with derived LE keys" am:
fbf43ab2c5
am:
f7f7a70659
Change-Id: I72dc909f8ca1fe0e9c371ec8bd0d86c68cb08aea
Subramanian Srinivasan [Sat, 15 Oct 2016 00:43:58 +0000 (00:43 +0000)]
Merge "Add device record for BR/EDR devices with derived LE keys"
am:
fbf43ab2c5
Change-Id: Ib5f6a34cde57ad6a3560127f7035e1ad8737cb98
Treehugger Robot [Sat, 15 Oct 2016 00:34:00 +0000 (00:34 +0000)]
Merge "Add device record for BR/EDR devices with derived LE keys"
Pavlin Radoslavov [Sat, 15 Oct 2016 00:24:30 +0000 (00:24 +0000)]
Merge "A2DP-related renaming: a2d_* to a2dp_*" am:
e0214a0be6
am:
44ae7c017f
Change-Id: Ic4c625f14330a0a5a81f0946f33dd036fefc19f8
Pavlin Radoslavov [Sat, 15 Oct 2016 00:20:28 +0000 (00:20 +0000)]
Merge "A2DP-related renaming: a2d_* to a2dp_*"
am:
e0214a0be6
Change-Id: I0f62fb6f38a94f3716a9a09a70a32e2175fc3686
Treehugger Robot [Sat, 15 Oct 2016 00:09:42 +0000 (00:09 +0000)]
Merge "A2DP-related renaming: a2d_* to a2dp_*"
Subramanian Srinivasan [Fri, 14 Oct 2016 23:41:08 +0000 (23:41 +0000)]
Fixes setting of service uuid mask during BLE APCF scan am:
96d078b59d
am:
377897a3a4
Change-Id: I9dbc4d197f18c1b901d9bcbef204c4c6c9e97849
Subramanian Srinivasan [Fri, 14 Oct 2016 23:37:26 +0000 (23:37 +0000)]
Fixes setting of service uuid mask during BLE APCF scan
am:
96d078b59d
Change-Id: Ie924fc835a32ec188a7a004445db1d80ca3af65f
Subramanian Srinivasan [Fri, 14 Oct 2016 22:43:34 +0000 (15:43 -0700)]
Add device record for BR/EDR devices with derived LE keys
Loads BLE keys stored in NVRAM to btm_sec database for BR/EDR
devices with cross transport derived LE keys after BT reset.
This change also makes sure that after BT reset, while loading
the bonded devices from NVRAM, the bonded devices(with device
type BR/EDR and having derived BLE keys) are also added to the
resolving list after loading the IRK into btm_sec database.
Test: vendor
Change-Id: I1c9164a947526cf2ea36156458d148f5cbee778f
Pavlin Radoslavov [Fri, 14 Oct 2016 22:14:37 +0000 (15:14 -0700)]
A2DP-related renaming: a2d_* to a2dp_*
Test: top-level compilation and running A2DP
Change-Id: Ibbd3176b86667885666bfe29025ec2c120fafce6
OSDN Git Service
