OSDN Git Service
Marie Janssen [Mon, 28 Nov 2016 21:17:46 +0000 (21:17 +0000)]
readability fix: No assigns in if conditionals am:
f33b6f434f am:
769d8fa541
am:
aee1e33601
Change-Id: I2201dcc51a56b9f2ed90d6d5abcf218dd61bbb1f
Marie Janssen [Mon, 28 Nov 2016 21:09:24 +0000 (21:09 +0000)]
readability fix: No assigns in if conditionals am:
f33b6f434f
am:
769d8fa541
Change-Id: I4207f71bf0e482ce1dec299c804d0569e79ff79f
Marie Janssen [Mon, 28 Nov 2016 21:01:53 +0000 (21:01 +0000)]
readability fix: No assigns in if conditionals
am:
f33b6f434f
Change-Id: I11c5af715b2ad86f33491fae7a5bd530f07a2e96
Marie Janssen [Tue, 22 Nov 2016 23:01:42 +0000 (15:01 -0800)]
readability fix: No assigns in if conditionals
Coccinelle-assisted:
@@
variable i;
expression E;
statement S1, S2;
@@
+ i = E;
if (
(
- (i = E)
+ i
!= ...
|
- (i = E)
+ i
== ...
|
- (i = E)
+ i
< ...
|
- (i = E)
+ i
> ...
|
- (i = E)
+ i
<= ...
|
- (i = E)
+ i
>= ...
|
- (i = E)
+ i
)
) S1 else S2
for file in $(find . -name "*.cc"); do
spatch --sp no-if-assigns.cocci --in-place $file
done
clang-format --style=file -i bta/**/*.cc
Test: mma -j37 and basic sanity testing on angler, sailfish
Change-Id: I41a2964afac347c24e13869b6c172e321e646091
Marie Janssen [Mon, 28 Nov 2016 17:06:07 +0000 (17:06 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am:
9f0cc0803c am:
43e7d69946
am:
807d696d03
Change-Id: Iffc5422f3daae61051fa46fbaab38b5ef5da8c25
Marie Janssen [Mon, 28 Nov 2016 17:02:07 +0000 (17:02 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am:
9f0cc0803c
am:
43e7d69946
Change-Id: I74c1098f11c0c1a6e3e48f5c7d56da650100ede2
Marie Janssen [Mon, 28 Nov 2016 16:58:06 +0000 (16:58 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
am:
9f0cc0803c
Change-Id: I3532ac2520edb3f5845ad36549bde71a566aaba0
Marie Janssen [Mon, 28 Nov 2016 16:51:08 +0000 (16:51 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
Jack He [Thu, 24 Nov 2016 06:03:05 +0000 (06:03 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04" am:
a4338e32c9 am:
3e7fe75f48
am:
237f83cacc
Change-Id: Ic4f08a3703fdf746162cffc93ac04f6e49e38531
Jack He [Thu, 24 Nov 2016 06:01:04 +0000 (06:01 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04" am:
a4338e32c9
am:
3e7fe75f48
Change-Id: Ib50f669253b4b159b0511bda5093ee3143b6a7ba
Jack He [Thu, 24 Nov 2016 05:58:35 +0000 (05:58 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"
am:
a4338e32c9
Change-Id: Ibba0d7622b417595b7b0234263c675ff57f47c8d
Treehugger Robot [Thu, 24 Nov 2016 05:54:57 +0000 (05:54 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"
Myles Watson [Thu, 24 Nov 2016 03:34:04 +0000 (03:34 +0000)]
Merge changes I9ebb32f0,I00393e2b am:
a9bfdf980f am:
6a1e9995a9
am:
74e4e4b303
Change-Id: I3a011f6c98fa1dbda00152d2567db9c68f7db0ed
Myles Watson [Thu, 24 Nov 2016 03:34:00 +0000 (03:34 +0000)]
Fix formatting after removing defines am:
9008888d24 am:
7413f94c6f
am:
6ff3e65656
Change-Id: Ic0562ab869a421a54215f74378c6c9253908e45f
Myles Watson [Thu, 24 Nov 2016 03:33:56 +0000 (03:33 +0000)]
Remove BTA_GATT_INCLUDED am:
9979121f08 am:
f6dc423c99
am:
813880af5e
Change-Id: I4dbc17498fd279a157293bad3fa952aa9dca9257
Myles Watson [Thu, 24 Nov 2016 03:31:32 +0000 (03:31 +0000)]
Merge changes I9ebb32f0,I00393e2b am:
a9bfdf980f
am:
6a1e9995a9
Change-Id: Ibc5ea1e948a790a2dcd419a7185a415af84ff2a4
Myles Watson [Thu, 24 Nov 2016 03:31:29 +0000 (03:31 +0000)]
Fix formatting after removing defines am:
9008888d24
am:
7413f94c6f
Change-Id: I78f6253c2c3697cd12e21eb6f30f79b6570570e5
Myles Watson [Thu, 24 Nov 2016 03:31:24 +0000 (03:31 +0000)]
Remove BTA_GATT_INCLUDED am:
9979121f08
am:
f6dc423c99
Change-Id: I1277d2d00f4c477bff7656ebc232ccbba4d3c953
Myles Watson [Thu, 24 Nov 2016 03:28:59 +0000 (03:28 +0000)]
Merge changes I9ebb32f0,I00393e2b
am:
a9bfdf980f
Change-Id: Ia3988047f5869db610602e821a504d6038359079
Myles Watson [Thu, 24 Nov 2016 03:28:58 +0000 (03:28 +0000)]
Fix formatting after removing defines
am:
9008888d24
Change-Id: I1eb41520b1434fd99d6459384e7ed1e7b0050984
Myles Watson [Thu, 24 Nov 2016 03:28:55 +0000 (03:28 +0000)]
Remove BTA_GATT_INCLUDED
am:
9979121f08
Change-Id: Ie0ad2741c407eabbfbf1a26100a73dc115aa9b93
Treehugger Robot [Thu, 24 Nov 2016 03:24:51 +0000 (03:24 +0000)]
Merge changes I9ebb32f0,I00393e2b
* changes:
Fix formatting after removing defines
Remove BTA_GATT_INCLUDED
Pavlin Radoslavov [Thu, 24 Nov 2016 02:41:21 +0000 (02:41 +0000)]
Fix a unit test failure related to SBC maxbitpool testing am:
29a0f792cd am:
f8044ce96a
am:
2696899797
Change-Id: I7a1cd29ef55ce6407090e2d12db78100248c2dc4
Pavlin Radoslavov [Thu, 24 Nov 2016 02:39:21 +0000 (02:39 +0000)]
Fix a unit test failure related to SBC maxbitpool testing am:
29a0f792cd
am:
f8044ce96a
Change-Id: I786d2306e850d6ba7fbbdfcc0ee4d28d2b8227f1
Pavlin Radoslavov [Thu, 24 Nov 2016 02:36:51 +0000 (02:36 +0000)]
Fix a unit test failure related to SBC maxbitpool testing
am:
29a0f792cd
Change-Id: I0df5b12f7c4866c9c40adad9a14ab70d637b8e2b
Jack He [Tue, 22 Nov 2016 20:39:52 +0000 (12:39 -0800)]
Fix x86_64 compilation on Ubuntu 14.04
* Add necessary includes in bt_trace.h
* Add toolchain specific configs
* Add libc++ import for clang
* Add libc++abi include for clang
* Add ipc_handler_linux.cc in service/BUILD.gn
* Use shared_mutex when _LIBCPP_VERSION < 3500
* Updated the build instructions
Test: ninja -C out/Default
Change-Id: I362ebf33f62910be817339cc6bdc62830f57db30
liuchao [Wed, 23 Nov 2016 08:21:01 +0000 (16:21 +0800)]
Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd
This fixes a potential NULL-pointer access in case p_remote_cmd is NULL
Test: mm -j 8
Change-Id: I06ae9afb9ae161296828e06b2c00d921189bee5c
Pavlin Radoslavov [Thu, 24 Nov 2016 00:36:14 +0000 (16:36 -0800)]
Fix a unit test failure related to SBC maxbitpool testing
The unit test failure was introduced / overlooked by an earlier CL.
Test: running "test/run_unit_tests.sh net_test_stack"
Change-Id: I40824a903a0dbef3bdab965ef5c390a8939cc5ee
Myles Watson [Wed, 23 Nov 2016 18:40:48 +0000 (18:40 +0000)]
Remove SMP_INCLUDED define am:
2e8e9f4213 am:
8a94420f7d
am:
17178729e0
Change-Id: I75c4155a39cc7ae335e99149599f1927e58cfb9a
Myles Watson [Wed, 23 Nov 2016 18:40:45 +0000 (18:40 +0000)]
Remove BLE_INCLUDED define am:
84baa7f16e am:
a4b8fc803b
am:
da39c46cca
Change-Id: I4508a91f639fc2dd6411392a56e5003f393fc7c5
Myles Watson [Wed, 23 Nov 2016 18:24:12 +0000 (18:24 +0000)]
Remove SMP_INCLUDED define am:
2e8e9f4213
am:
8a94420f7d
Change-Id: I3cf3108a03429d3c58650a5d9c7cc53e42d7626c
Myles Watson [Wed, 23 Nov 2016 18:24:08 +0000 (18:24 +0000)]
Remove BLE_INCLUDED define am:
84baa7f16e
am:
a4b8fc803b
Change-Id: I290f827e4a7cdc1576b2d0abdc004a2e4ed350a9
Myles Watson [Wed, 23 Nov 2016 18:21:37 +0000 (18:21 +0000)]
Remove SMP_INCLUDED define
am:
2e8e9f4213
Change-Id: I367644b2861f510a54c04159314b25a8f37dfd17
Myles Watson [Wed, 23 Nov 2016 18:21:36 +0000 (18:21 +0000)]
Remove BLE_INCLUDED define
am:
84baa7f16e
Change-Id: I5fd29a1f8c9f7d88e04c689fbd3514cfcb546af4
Myles Watson [Wed, 16 Nov 2016 00:33:22 +0000 (16:33 -0800)]
Fix formatting after removing defines
clang-format -i --style=file bta/*/* btif/*/* include/*
Test: mma -j32
Change-Id: I9ebb32f0cc5bd24a7cb2ae25699999aab5036b13
Myles Watson [Fri, 18 Nov 2016 16:42:23 +0000 (08:42 -0800)]
Remove BTA_GATT_INCLUDED
Test: Connect to a BLE Keyboard
Change-Id: I00393e2bf09fb65533e953896563e69aab5a22dc
Myles Watson [Tue, 15 Nov 2016 00:45:15 +0000 (16:45 -0800)]
Remove SMP_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I785692cb61f4ca5ccccab7424aa03f50c54523c9
Myles Watson [Mon, 14 Nov 2016 20:05:37 +0000 (12:05 -0800)]
Remove BLE_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I5f8f4017c90c3c404004632fd10e6c2b93bd7783
Sanket Agarwal [Wed, 23 Nov 2016 02:21:18 +0000 (02:21 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off" am:
4ef712926d am:
cb28a5aa8e
am:
ce3efe9c62
Change-Id: I3e805fa8e8889ab353d7ba11d08ce1d0c3919a91
Sanket Agarwal [Wed, 23 Nov 2016 02:18:47 +0000 (02:18 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off" am:
4ef712926d
am:
cb28a5aa8e
Change-Id: I6648c4869610f37257cdd0cc7477ea8cff2f3cb5
Sanket Agarwal [Wed, 23 Nov 2016 02:16:48 +0000 (02:16 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off"
am:
4ef712926d
Change-Id: I8d330883afc4c593ab615250be435ca71c95b199
Sanket Agarwal [Wed, 23 Nov 2016 02:11:36 +0000 (02:11 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off"
Jakub Pawlowski [Wed, 23 Nov 2016 02:08:21 +0000 (02:08 +0000)]
Merge "Report proper advertiser status on registration error" am:
1f28e7bdf1 am:
84c99c6ca0
am:
86c0e36be0
Change-Id: I5b6a6ab7ca5a74771bd018098a45652ad2af4283
Jakub Pawlowski [Wed, 23 Nov 2016 02:03:19 +0000 (02:03 +0000)]
Merge "Report proper advertiser status on registration error" am:
1f28e7bdf1
am:
84c99c6ca0
Change-Id: I1c036dfef83184a596f7e5260dbec0cd77e824c0
Jakub Pawlowski [Wed, 23 Nov 2016 01:58:07 +0000 (01:58 +0000)]
Merge "Report proper advertiser status on registration error"
am:
1f28e7bdf1
Change-Id: I3e87e5c14339f54abe763051e7e62bdb1e26507c
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Report proper advertiser status on registration error"
Marie Janssen [Wed, 23 Nov 2016 01:34:46 +0000 (01:34 +0000)]
btif: DRY up command functions am:
1ee1d33e3a am:
df56cc2c63
am:
3d8a763419
Change-Id: Ib32742f7f768bb7db2c669c0492267a6bbab587f
Marie Janssen [Wed, 23 Nov 2016 01:32:45 +0000 (01:32 +0000)]
btif: DRY up command functions am:
1ee1d33e3a
am:
df56cc2c63
Change-Id: I03685e2393cbc7ef3914f3c75a36570f9c26a9c9
Marie Janssen [Wed, 23 Nov 2016 01:30:45 +0000 (01:30 +0000)]
btif: DRY up command functions
am:
1ee1d33e3a
Change-Id: I6d900fa8bc9bf99772c22311d99f01bf3a03ae63
Marie Janssen [Wed, 16 Nov 2016 17:58:22 +0000 (09:58 -0800)]
btif: DRY up command functions
also:
clang-format -i --style=file btif/src/btif_rc.cc
Test: sl4a AvrcpController tests
Change-Id: I95f7e6922c096e2460ecdeafad162515f5600d97
Sanket Agarwal [Tue, 22 Nov 2016 23:00:25 +0000 (15:00 -0800)]
Audio pops due to queue not flushed when focus taken off
Test: (Manual) The stutter after music is resumed is gone
Bug: b/
32296397
Change-Id: Id188c56a196c2ece13510488e6bcfb717bcc610c
Jakub Pawlowski [Tue, 22 Nov 2016 20:51:20 +0000 (12:51 -0800)]
Report proper advertiser status on registration error
When advertiser is not started because too many advertisers are
registered, return proper error code.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Ie8a94b964170edbbf1c56f39b03ad98f745a4861
Ajay Panicker [Tue, 22 Nov 2016 20:18:55 +0000 (20:18 +0000)]
Remove some usages of UINT_TO_PTR macro am:
58d57a46cb am:
d0f6018f0f
am:
ba3f39aba3
Change-Id: Ib66d4dfa83f0edab48c55d9e6de0369186821e0a
Ajay Panicker [Tue, 22 Nov 2016 20:15:26 +0000 (20:15 +0000)]
Remove some usages of UINT_TO_PTR macro am:
58d57a46cb
am:
d0f6018f0f
Change-Id: I0f560bce461f8631996e5575299f60655511ebed
Ajay Panicker [Tue, 22 Nov 2016 20:12:26 +0000 (20:12 +0000)]
Remove some usages of UINT_TO_PTR macro
am:
58d57a46cb
Change-Id: Ib7b119d61954ea75fbf0e9a195c7d2b9ca2b2d8a
Ajay Panicker [Mon, 21 Nov 2016 21:16:48 +0000 (13:16 -0800)]
Remove some usages of UINT_TO_PTR macro
Bug:
32995283
Test: Sanity test with various devices
Change-Id: I20a0b1571c044170ba5a8792d8e990a6790cbce2
Marie Janssen [Tue, 22 Nov 2016 17:55:46 +0000 (17:55 +0000)]
Constant Cleanup: Remove BT_TRACE_VERBOSE am:
a1e7e55610 am:
a17f209cc4
am:
1a67d47acf
Change-Id: I07f4811bd3a057dd60bdd16a103e67ffae0f911b
Marie Janssen [Tue, 22 Nov 2016 17:53:16 +0000 (17:53 +0000)]
Constant Cleanup: Remove BT_TRACE_VERBOSE am:
a1e7e55610
am:
a17f209cc4
Change-Id: Idbf47810a5dce10340782de3181ec3eafe314a03
Marie Janssen [Tue, 22 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Constant Cleanup: Remove BT_TRACE_VERBOSE
am:
a1e7e55610
Change-Id: I9fd413cc608ea9e7f838314685324c0c9e8d5a52
Marie Janssen [Tue, 22 Nov 2016 15:50:15 +0000 (07:50 -0800)]
Constant Cleanup: Remove BT_TRACE_VERBOSE
BT_TRACE_VERBOSE turned on constants-as-strings in
logs in many parts of the stack, which is preferable
to obscure numbers.
Test: m -j37, check logspam is not worse than normal on a device
Change-Id: I1d24f1c1337290a8a2bcd9a0d937c9e0f1f1c611
Jakub Pawlowski [Fri, 18 Nov 2016 22:42:29 +0000 (22:42 +0000)]
Move startAdvertising() logic into native code (2/3) am:
a75087effc am:
6ce255a1fb
am:
21abbfc3e9
Change-Id: Iab2b59bccb2fc58ced8c2ea589e9f6bf68acc4f2
Jakub Pawlowski [Fri, 18 Nov 2016 22:39:00 +0000 (22:39 +0000)]
Move startAdvertising() logic into native code (2/3) am:
a75087effc
am:
6ce255a1fb
Change-Id: I49ab29caee690b676b54d8e4f305680b1047b40d
Jakub Pawlowski [Fri, 18 Nov 2016 22:35:58 +0000 (22:35 +0000)]
Move startAdvertising() logic into native code (2/3)
am:
a75087effc
Change-Id: Id4350dc5b6ba474106026eb1d781c341ceee8c78
Jakub Pawlowski [Thu, 17 Nov 2016 21:27:28 +0000 (13:27 -0800)]
Move startAdvertising() logic into native code (2/3)
AdvertiseManager.startAdvertising() was implemented in Java layer for
historical reasons. Now that we have nice native callbacks and tests,
it can be moved into native code, where it will be shared between
Android daemon and bluetoothtbd.
Bug:
30622771
Test: native tests added to cover startAdvertising
Change-Id: Idf5d3c53b6ad21d8c7e239b5b150b88e073bb709
Andre Eisenbach [Fri, 18 Nov 2016 19:39:38 +0000 (19:39 +0000)]
Merge "Do not reject valid SBC codec parameters" am:
54ee0d8916 am:
ddbac25620
am:
20e708590b
Change-Id: Ic397a124af42299027134b80639a64a2ab545c68
Andre Eisenbach [Fri, 18 Nov 2016 19:36:08 +0000 (19:36 +0000)]
Merge "Do not reject valid SBC codec parameters" am:
54ee0d8916
am:
ddbac25620
Change-Id: I427c3838eaeefff281635d40eb7aef12aa5837ed
Andre Eisenbach [Fri, 18 Nov 2016 19:33:07 +0000 (19:33 +0000)]
Merge "Do not reject valid SBC codec parameters"
am:
54ee0d8916
Change-Id: I41e3215f9f385d60bc7a183011fccc4f51a6cca3
Andre Eisenbach [Fri, 18 Nov 2016 19:27:44 +0000 (19:27 +0000)]
Merge "Do not reject valid SBC codec parameters"
Andre Eisenbach [Fri, 18 Nov 2016 18:03:46 +0000 (10:03 -0800)]
Do not reject valid SBC codec parameters
Fixes logic in A2DP_CodecInfoMatchesCapabilitySbc that could otherwise
reject valid SBC codec parameters, leading to A2DP being disconnected.
Example:
Tesla Model S - min bitpool = 2; max bitpool = 60
Android - min bitpool = 2; max bitpool = 53
Bug:
32688022
Test: Added test to test_a2dp_is_source_codec_supported to cover this bug
Change-Id: If02bab1c47f926f82a636184cf3cbd1edbbe223a
Jakub Pawlowski [Thu, 17 Nov 2016 20:06:21 +0000 (20:06 +0000)]
Add BUILD.gn for tinyxml am:
cc51b4f8c2 am:
bf85dc4ab2
am:
2329fe8fc2
Change-Id: I82a14a1596f97b831efb3abd67c46efc7d2f14e4
Jakub Pawlowski [Thu, 17 Nov 2016 19:58:19 +0000 (19:58 +0000)]
Add BUILD.gn for tinyxml am:
cc51b4f8c2
am:
bf85dc4ab2
Change-Id: Ia536410a14df3c89f351fc25747f02891e377e41
Jakub Pawlowski [Thu, 17 Nov 2016 19:50:22 +0000 (19:50 +0000)]
Add BUILD.gn for tinyxml
am:
cc51b4f8c2
Change-Id: Ic27a1bb7c558fcc91bffb75e726c36547f1b5dda
Jakub Pawlowski [Thu, 17 Nov 2016 19:37:17 +0000 (11:37 -0800)]
Add BUILD.gn for tinyxml
Change-Id: I82d2bb25470d46516e0ab6114bf85cb93f9023ac
Andre Eisenbach [Thu, 17 Nov 2016 07:30:06 +0000 (07:30 +0000)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect." am:
475f8e0e65 am:
1d6f0568b3
am:
dd882c7201
Change-Id: Id6dacce5f84cc405902cdac8d6b27cb2e2c217ed
Andre Eisenbach [Thu, 17 Nov 2016 07:21:31 +0000 (07:21 +0000)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect." am:
475f8e0e65
am:
1d6f0568b3
Change-Id: I7c9ad51dd6b758c5df72802b4c32dcdf029f0911
Andre Eisenbach [Thu, 17 Nov 2016 07:14:02 +0000 (07:14 +0000)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
am:
475f8e0e65
Change-Id: I9169f8f868fd91a340a189f677fdc5afe0f4c539
Andre Eisenbach [Thu, 17 Nov 2016 05:08:20 +0000 (21:08 -0800)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
This reverts commit
5bd9ffbe6fbf22b7072bc1a63e3152a916276ddf.
Despite the original patch intention, it actually causes various remote
devices (tested Android Auto, Logitech Speakerphone, Tesla Model S and
many more) to no connect A2DP (only HFP) in various re-connect
scenarios.
This is due to the fact that the stream end point type is not correctly
determined yet in some of these scenarios causing the AVDT stream to be
closed prematurely and thus the A2DP connection to fail.
Test: manual; various devices
Fixes:
32688022
Ajay Panicker [Thu, 17 Nov 2016 03:06:32 +0000 (03:06 +0000)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define am:
365fbfb547 am:
5150b5f548
am:
3b49f01010
Change-Id: I49396efabbd35be9aa48121eeea02a9d144a6a36
Ajay Panicker [Thu, 17 Nov 2016 02:58:29 +0000 (02:58 +0000)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define am:
365fbfb547
am:
5150b5f548
Change-Id: I695342f41f2172f18ee6502ba357e9b615b09b6d
Ajay Panicker [Thu, 17 Nov 2016 02:50:30 +0000 (02:50 +0000)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define
am:
365fbfb547
Change-Id: I13c2a5acf6f85b1866892e98875b7ab7e44528b1
Ajay Panicker [Wed, 16 Nov 2016 21:47:27 +0000 (13:47 -0800)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define
Use AVRC_ADV_CTRL_INCLUDED just to control features instead of
controlling features and inclusion of functions.
Change-Id: Ifff0d7006c3d8df1d57c79ace19ee60487c2f0a5
Ajay Panicker [Wed, 16 Nov 2016 22:22:28 +0000 (22:22 +0000)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems am:
135db4f344 am:
b5078aff67
am:
af0d581ae4
Change-Id: Ia495c90f8eda427fe231d2b806168eb1c0ee577d
Ajay Panicker [Wed, 16 Nov 2016 22:14:28 +0000 (22:14 +0000)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems am:
135db4f344
am:
b5078aff67
Change-Id: I0a8cfc7e492357e4c7da2db61dad1abb179b0cbe
Ajay Panicker [Wed, 16 Nov 2016 22:07:27 +0000 (22:07 +0000)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems
am:
135db4f344
Change-Id: Iab92a03c25fc9e20b7e1f36a267d1d2f501e53e7
Ajay Panicker [Fri, 11 Nov 2016 04:02:24 +0000 (20:02 -0800)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems
Bug:
24400656
Test: Previously crashed Bluetooth, does not crash after patch
Change-Id: Ia381abca72e46d369a0de1749e42d1b6273a321a
Marie Janssen [Wed, 16 Nov 2016 03:39:21 +0000 (03:39 +0000)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs am:
133f0b6503 am:
e6de705f4a
am:
74872eefea
Change-Id: I533dd10434e1133917bf2fae63af7352e69e1996
Marie Janssen [Wed, 16 Nov 2016 03:32:20 +0000 (03:32 +0000)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs am:
133f0b6503
am:
e6de705f4a
Change-Id: I0a17dfc0eedfdd2f6902238aef2b94ec831e167e
Marie Janssen [Wed, 16 Nov 2016 03:25:20 +0000 (03:25 +0000)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs
am:
133f0b6503
Change-Id: I69ac329cdb25382c535941900cb94d2f8ca17f13
Marie Janssen [Tue, 15 Nov 2016 22:54:16 +0000 (14:54 -0800)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs
AVRCP controller side support is always included now.
Test: croot system/bt && mma -j37
Change-Id: I22260b4f123b352f70cbab54a19b5f8f5f171825
Marie Janssen [Tue, 15 Nov 2016 23:05:04 +0000 (23:05 +0000)]
btif: Remove unused uinput interface code am:
919fac80da am:
0781fd9000
am:
4b79bf6a50
Change-Id: I76fff40f73b69ea8824c6d5babd041506f5370fd
Marie Janssen [Tue, 15 Nov 2016 22:57:04 +0000 (22:57 +0000)]
btif: Remove unused uinput interface code am:
919fac80da
am:
0781fd9000
Change-Id: I05b41f9b033f7a9b4aedd99b6bd133ae2470a2a0
Marie Janssen [Tue, 15 Nov 2016 22:49:33 +0000 (22:49 +0000)]
btif: Remove unused uinput interface code
am:
919fac80da
Change-Id: Ic775fc53ed88138ccfcd1630b48b615fb23f9025
Marie Janssen [Tue, 15 Nov 2016 16:24:24 +0000 (08:24 -0800)]
btif: Remove unused uinput interface code
uinput isn't used anymore; all media commands go through the HAL
Test: croot system/bt && mma -j37
Change-Id: I83ab133794683a26e250ea10927fa95b2e2cb28a
liuchao [Tue, 15 Nov 2016 21:42:43 +0000 (21:42 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU" am:
f62708b918 am:
32f351d951
am:
f45280f1a2
Change-Id: I786c4987913976f8f7fe549f46bfcc6a827202e4
liuchao [Tue, 15 Nov 2016 21:33:56 +0000 (21:33 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU" am:
f62708b918
am:
32f351d951
Change-Id: Ic888674857c3f6faea969606289df39f943d0101
liuchao [Tue, 15 Nov 2016 21:33:28 +0000 (21:33 +0000)]
NULL-pointer access before check in BTM_SetBleDataLength am:
7d1faf334e am:
f7dd4ac4c1
am:
13b663a687
Change-Id: If8f726320396660e632a1754599403edef8c13f7
liuchao [Tue, 15 Nov 2016 21:27:08 +0000 (21:27 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
am:
f62708b918
Change-Id: I07fb489e12c92fb3371fdeaaaa0225951985d48e
liuchao [Tue, 15 Nov 2016 21:26:28 +0000 (21:26 +0000)]
NULL-pointer access before check in BTM_SetBleDataLength am:
7d1faf334e
am:
f7dd4ac4c1
Change-Id: I9939f9b681c27c737c84760b388c813dadca05f5
Treehugger Robot [Tue, 15 Nov 2016 21:21:15 +0000 (21:21 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
liuchao [Tue, 15 Nov 2016 21:19:27 +0000 (21:19 +0000)]
NULL-pointer access before check in BTM_SetBleDataLength
am:
7d1faf334e
Change-Id: I3b00debc158e417177b139c72ed1e6d2410b901a
OSDN Git Service
