OSDN Git Service
Greg Hartman [Thu, 4 Aug 2016 23:27:29 +0000 (23:27 +0000)]
Implements some additional commands
am:
03c2c7c22a
Change-Id: I5a0f2011966daad1679a4f196996552db40f5e56
Greg Hartman [Tue, 26 Jul 2016 20:19:02 +0000 (13:19 -0700)]
Implements some additional commands
- Added/Improved responses to certain opcodes on bt_vendor.cc
- Added handlers for a couple of commands used in L
Change-Id: I85c02553057e4ea3a3e51795c2e1a2bb679fd5e1
Mudumba Ananth [Thu, 4 Aug 2016 01:37:03 +0000 (01:37 +0000)]
HFP 1.7 profile update (1/4)
am:
4de9bbcde7
Change-Id: I52433802594e44702152b57f00f7d5511f4741ac
Mudumba Ananth [Mon, 29 Feb 2016 10:21:43 +0000 (02:21 -0800)]
HFP 1.7 profile update (1/4)
-> Added AG support for HFP 1.7 version upgrade which
adds new type of indicator called HF(headset) indicators.
-> Added support for two new AT commands AT + BIND and AT + BIEV
which have been appended to Hands-Free SLC sequence.
-> Added support to propagate the above commands and their data to
the upper layers.
Bug:
19983867
Change-Id: I93d5b2af949f9fb99507a954e623cd0927ddc976
(cherry picked from commit
e5bed64926d6ae45501617052f90932287da135b)
Jakub Pawlowski [Thu, 4 Aug 2016 00:01:51 +0000 (00:01 +0000)]
Rmove write type from GATT descriptor writes (4/4)
am:
bb920a65b9
Change-Id: I9301e43850d5e97256f3eca0a47047c47757c08b
Jakub Pawlowski [Tue, 21 Jun 2016 23:16:09 +0000 (16:16 -0700)]
Rmove write type from GATT descriptor writes (4/4)
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".
Change-Id: I60bb0b1489b417af96975265a023c356ace293bd
Jakub Pawlowski [Wed, 3 Aug 2016 13:00:52 +0000 (13:00 +0000)]
Merge changes from topic 'beautiful-gatt-server'
am:
3cf12a6cfc
Change-Id: I542982eb13daa23c2ee75c74c3a0a04a94449de0
Jakub Pawlowski [Wed, 3 Aug 2016 10:21:43 +0000 (10:21 +0000)]
Merge changes from topic 'beautiful-gatt-server'
* changes:
GATT Server refactoring (4/4)
Add C++ Parcelable types for Service, Characteristic, Descriptor
Jakub Pawlowski [Mon, 1 Aug 2016 22:36:53 +0000 (22:36 +0000)]
Merge "Fix build when SMP_DEBUG=TRUE plus logging improvements"
am:
980147c889
Change-Id: I97ffc1ef3c2a953f486829b57da9f558c2b3ecd5
Treehugger Robot [Mon, 1 Aug 2016 22:29:31 +0000 (22:29 +0000)]
Merge "Fix build when SMP_DEBUG=TRUE plus logging improvements"
Pavlin Radoslavov [Fri, 29 Jul 2016 17:18:14 +0000 (17:18 +0000)]
Relax some of the timing parameters in the Alarm unit tests
am:
9713b9476c
Change-Id: Ibb7599098fd10e2b005622488160ffdce10aea3f
Jakub Pawlowski [Sat, 26 Mar 2016 07:47:23 +0000 (00:47 -0700)]
GATT Server refactoring (4/4)
Right now in order to add gatt service, we need to add it piece by
piece - each characteristic and descriptor separately. This causes lots
of concurrency errors in higher layers. Instead accept whole service
definition and start whole service at once.
Also, use handles to identify GATT server attributes. It's already done
on clinet side.
Bug:
27999121
Change-Id: I42c796809423d116fe6755ef8b1c40da270427a5
Jakub Pawlowski [Tue, 24 May 2016 19:42:45 +0000 (12:42 -0700)]
Add C++ Parcelable types for Service, Characteristic, Descriptor
This types will be used in upcoming GATT Client/Server code. They will
match ones you can found in frameworks/base.
Change-Id: I6080310a726bcbcd0cd36970712928b188f7bd24
Jakub Pawlowski [Thu, 28 Jul 2016 13:11:36 +0000 (06:11 -0700)]
Fix build when SMP_DEBUG=TRUE plus logging improvements
Bug:
30460956
Change-Id: I2611501d1961b104c8e66b1a3fca414936dc321f
Pavlin Radoslavov [Thu, 28 Jul 2016 20:11:10 +0000 (13:11 -0700)]
Relax some of the timing parameters in the Alarm unit tests
In certain environments (e.g., virtual machines), the alarm timeouts
can late by tens of ms (40ms have been observed in some cases).
Relaxing some of the unit tests timing parameters, so we can
continue testing for correctness as covered by the AlarmTest.
Bug:
28907913
Change-Id: I211c36a689774c5cdf427039e4c9184cf4147604
Ayan Ghosh [Thu, 28 Jul 2016 06:24:04 +0000 (06:24 +0000)]
Proper handling of AV connection collision
am:
09d91c0ceb
Change-Id: I7ace6b2005e544c8821271a9d575ee49f883ada1
Ayan Ghosh [Fri, 22 Jul 2016 09:41:11 +0000 (15:11 +0530)]
Proper handling of AV connection collision
Use case:
1. Pair to Remote
2. Turn OFF/ON BT on DUT
3. After DUT's BT is turned ON, Remote would reconnect to DUT
Failure:
Bluetooth settings UI continues to display Connecting when
BT was Turned OFF and ON.
Root cause:
- This is a connection collision case where remote is not responding
to DUT initiated SDP attribute fetch request for AV. AV holds outgoing
connection for sometime and meanwhile remote starts AV connection
from its end. Then DUT disconnects the SDP channel after a second
without waiting to fetch requested info, and this confuses DUT's AV
state machine. The outgoing connection could not proceed as incoming
AV L2CAP connects, because DUT's AV state machine is not equipped
with handling this scenario. On incoming connection timer expiry, it
does not start AV media channel as it finds AV Open has not been done
from upper layer after incoming L2CAP got connected.
- When the incoming path 2s timer expires, the DUT checks whether Open
has been called after incoming state is set. This is not the case here,
because Open was triggered earlier as as part of the outgoing
connection. As a result, A2DP cannot connect at all.
Fix:
- Properly set collision flags for handling AV connection collision.
- Update BTA AV handle even when BTIF AV state machine is yet to be built.
Bug:
30362987
Change-Id: I02a3adb62479b0f762bc792a5727d06e11eaaa52
Greg Hartman [Tue, 26 Jul 2016 19:58:58 +0000 (19:58 +0000)]
Allow the Bluetooth test library to be used as a vendor library
am:
6bfe283db7
Change-Id: I0be79f4e37637a8af166a8b307c4b664bc777036
Greg Hartman [Tue, 26 Jul 2016 03:22:48 +0000 (20:22 -0700)]
Allow the Bluetooth test library to be used as a vendor library
Change-Id: I479fd72482399f878ef045271c7b493c94aa5ab7
Greg Kaiser [Mon, 25 Jul 2016 22:45:12 +0000 (22:45 +0000)]
btif: Fix logic bug within register_application
am:
696996c115
Change-Id: Id2c2d4d2c171dfa9d8389a901e1f0f627628fa8e
Greg Kaiser [Mon, 27 Jun 2016 18:27:09 +0000 (11:27 -0700)]
btif: Fix logic bug within register_application
We were checking for the SINK bit twice in the same condition,
and would incorrectly report a SINK only mask as a DUAL device,
and would never hit the logic path to report a device as SINK.
Bug:
29763285
Change-Id: Ibc39db6396c09ddcd63896302dabf72841304cf2
Jakub Pawlowski [Wed, 20 Jul 2016 15:10:48 +0000 (15:10 +0000)]
Don\'t use move in FOR_EACH_* macro
am:
e84c4bdb5f
Change-Id: Ibda5234458e95627b16fcc94edb4331b2c8f960a
Jakub Pawlowski [Wed, 20 Jul 2016 10:12:49 +0000 (03:12 -0700)]
Don't use move in FOR_EACH_* macro
FOR_EACH_* macros are resolved to for loop. Using std::move inside it
will cause already moved object to be used when more than one observer
is registered. This patch fixes that.
Change-Id: Iaaa314f5eeed4094d1e0fc951d3664fb1514ba15
Andre Eisenbach [Mon, 18 Jul 2016 22:23:16 +0000 (22:23 +0000)]
Make parameter set S4 default for eSCO
am:
3edefef0ce
Change-Id: I2beae8e74d45d29ca8868b9baa62ef3c818ed1de
Andre Eisenbach [Fri, 15 Jul 2016 17:50:32 +0000 (10:50 -0700)]
Make parameter set S4 default for eSCO
Bug:
29615817
Change-Id: I5256b31a746433f10c2e7de1629952f668c99d16
(cherry picked from commit
af5b8248593c80acd8b1afb695eafe5801b44f7d)
Subramanian Srinivasan [Mon, 18 Jul 2016 09:16:05 +0000 (09:16 +0000)]
Process Gatt read multiple response properly
am:
089cd116de
Change-Id: Ieff85e5040d7fa3db24a7946a05d4958480ddd08
Subramanian Srinivasan [Mon, 16 May 2016 18:14:03 +0000 (11:14 -0700)]
Process Gatt read multiple response properly
The Gatt server multi response queue is made NULL after each Gatt
server response is sent by BT stack in response to the remote Gatt
client's request. But the multi response queue is not initialized
again to process subsequent read multiple Gatt server responses.
Hence, the BT stack does not send Gatt server responses for the
subsequent read multiple requests from remote device which inturn
leads to disconnection. This change would process read multiple
responses by initializing the queue when it is null.
Some of Bluetooth certification test cases involve testing
Gatt server's capability to process and send read multiple
response.
Test case: TC_GAR_SR_BV_05_C
This change also cleans up unnecessary initialization and freeing
of multi rsp queue. This change makes sure that the stack initializes
multi rsp queue only when it is necessary(ie only when the Gatt
multiple read response is being processed).
Bug:
29011255
Change-Id: Ia3e2e1569ee16cac9c518f95501945257b9fb7fd
Jakub Pawlowski [Thu, 14 Jul 2016 19:36:45 +0000 (19:36 +0000)]
Fix linux build, missing strlcpy
am:
3a2dc880ce
Change-Id: I306f667701519fed87b97138e0b47aab0cf2cc3d
Jakub Pawlowski [Thu, 14 Jul 2016 17:59:40 +0000 (17:59 +0000)]
Update libchrome BUILD.gn
am:
3ad44520b8
Change-Id: If6e3c284c52fe8db1cbb61c7a41ec0024b5a696a
Jakub Pawlowski [Thu, 14 Jul 2016 11:55:18 +0000 (04:55 -0700)]
Fix linux build, missing strlcpy
Compilation was failing with "missing strlcpy", this patch fixes that
Change-Id: Ic35d4bf4bed065fce27250a2d63d2fff606f6a3e
Jakub Pawlowski [Thu, 14 Jul 2016 11:53:30 +0000 (04:53 -0700)]
Update libchrome BUILD.gn
Update BUILD.gn to match libchrome from top of AOSP.
Change-Id: I1d8638d67f816479e58af627ab5bd00649b72697
Jakub Pawlowski [Tue, 12 Jul 2016 22:13:55 +0000 (22:13 +0000)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback
am:
7932727cbe
Change-Id: I9edcca7deb2484d8b64c8f63872b4b08c9f4ecc6
Jakub Pawlowski [Thu, 7 Jul 2016 23:40:11 +0000 (16:40 -0700)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback
Currently native GattServer clients can't tell wether someone connected
or disconnnected to the device. This patch fixed that, by exposing
OnConnectionStateChangedCallback
Bug:
29835693
Change-Id: Ia7ef592f4031d021ab1b45808126ca57f9348d0e
Chih-Hung Hsieh [Fri, 8 Jul 2016 18:47:25 +0000 (18:47 +0000)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA()
am:
42e055353c
Change-Id: I9273b46c7e11da04f93cd38383de697dcf3dc750
Chih-Hung Hsieh [Fri, 8 Jul 2016 17:29:55 +0000 (10:29 -0700)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA()
Bug:
28705665
Change-Id: Id714a799c649ff85cf8bab9d8370626606fa7f2c
Andre Eisenbach [Thu, 7 Jul 2016 23:11:20 +0000 (23:11 +0000)]
Disable auto-pairing for hands-free devices
am:
43b12942ca
Change-Id: I1ca91fdcf1be9be6e1048123b79bf2eb4f44a60f
Andre Eisenbach [Thu, 7 Jul 2016 16:58:59 +0000 (09:58 -0700)]
Disable auto-pairing for hands-free devices
Fixes:
30004157
Change-Id: Id170856fbee5ea345f02f55d3a6e3376d846c2de
(cherry picked from commit
e8b81851c33095fe3b3ac78329073309be5421e1)
Jakub Pawlowski [Sat, 2 Jul 2016 01:39:08 +0000 (01:39 +0000)]
Add callbacks to GATT read/write operation
am:
24ea892320
Change-Id: I49b30d782f1260f63a75a4006c61b9ecc0f23d76
Jakub Pawlowski [Fri, 13 May 2016 23:39:25 +0000 (16:39 -0700)]
Add callbacks to GATT read/write operation
There is no need for read/write callback to be a global event. It should
execute local callback instead.
Change-Id: Id7e915af9d30092d2f754eddc7c3aed4970eeb2f
Ajay Panicker [Fri, 1 Jul 2016 23:22:30 +0000 (23:22 +0000)]
Add logs for AVRCP commands that originate from a remote device
am:
da34e5b65e
Change-Id: Ia29f28b3bb71da2b1f1beec72dad059fa9febf3f
Ajay Panicker [Wed, 29 Jun 2016 23:39:07 +0000 (16:39 -0700)]
Add logs for AVRCP commands that originate from a remote device
Change-Id: I02b213913685d831bfe00e1938baef953428e048
Jacky Cheung [Fri, 1 Jul 2016 20:27:44 +0000 (20:27 +0000)]
Merge \"SMP: Delay authorization complete.\"
am:
8afa82d0c3
Change-Id: Iade6d0379d44b26c6b2b401985c09e16916915d4
Jacky Cheung [Fri, 1 Jul 2016 20:23:35 +0000 (20:23 +0000)]
Merge "SMP: Delay authorization complete."
Chih-Hung Hsieh [Thu, 30 Jun 2016 23:57:54 +0000 (23:57 +0000)]
Fix google-explicit-constructor warnings in system/bt.
am:
3398730eac
Change-Id: I54f2a53f6a2a6bf3ceb524966d98e2c1c80a58a3
Chih-Hung Hsieh [Thu, 30 Jun 2016 22:45:24 +0000 (15:45 -0700)]
Fix google-explicit-constructor warnings in system/bt.
* Declare conversion constructors as 'explicit'.
* Add NOLINT to implicit converters.
Bug:
28341362
Change-Id: I81fecf19c0ee2e64dd6778b3dea78e04f111bfb4
Test: build with clang-tidy
Andre Eisenbach [Thu, 30 Jun 2016 00:22:37 +0000 (00:22 +0000)]
Log RSSI when A2DP buffers are flushed
am:
741c1b4cc9
Change-Id: I4dc09a22922650dbeef7e3a254cc1f571419113c
Andre Eisenbach [Wed, 29 Jun 2016 23:14:06 +0000 (23:14 +0000)]
A2DP media task: Flush full TX queue on congestion
am:
de3505fc6c
Change-Id: I82ed74baec551c7e3c1535eddb223c21a471d8c6
Andre Eisenbach [Wed, 29 Jun 2016 19:46:13 +0000 (12:46 -0700)]
Log RSSI when A2DP buffers are flushed
To add another datapoint and potentially narrow down *why* we had to
flush the buffers, add RSSI logging to keep track of signal strength
during audio drop-out events.
Change-Id: Ie52f56290951130165a9f375a898a9bacf459d55
Andre Eisenbach [Thu, 23 Jun 2016 23:14:53 +0000 (16:14 -0700)]
A2DP media task: Flush full TX queue on congestion
Currently, our TX queue does not allow for quick recovery of minor
congestion. As we only clear as much room in the queue as is needed to
fix the news frames needed for a given timer tick, any minor congestion
on the TX path can result in single frames to be dropped over an
excessively long amount of time.
From the "just rip the band-aid off" school of thought, drop the whole
queue instead to cause a single drop-out on congestion and catch up to
the live stream immediately, hoping that the stream recovers...
Bug:
29601962
Change-Id: I482c3cfef6d8b51143e54733eb2da5f70663636f
(cherry picked from commit
d881c4b46776fe03a5861a3021bbe739b1f3cc58)
Jacky Cheung [Tue, 17 May 2016 20:42:43 +0000 (13:42 -0700)]
SMP: Delay authorization complete.
Delay authorization complete during Bond Pending state in SMP.
Instead of automatically advancing the Bond Pending state, create
a 500ms window to allow the slave to stop pairing by sending over
the Pairing Failed command during the Bond Pending state.
BUG:
28475887
Change-Id: Ie59ff23128b5d523aa13c4db599be97396097cc3
Jacky Cheung [Wed, 29 Jun 2016 01:15:04 +0000 (01:15 +0000)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
am:
e909ff50ff
Change-Id: Iafd1759f79364e80101344f5023726feb146ff53
Jacky Cheung [Mon, 23 May 2016 19:39:01 +0000 (12:39 -0700)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
These events are used to track HCI timeout and configuration file
usage respectively.
Change-Id: I5c8b6ef20b61f03b9ccb74f3b1c9784e4653b770
Jakub Pawlowski [Tue, 28 Jun 2016 19:01:08 +0000 (19:01 +0000)]
Simplify GATT characteristic read memory handling
am:
3c5451da9d
Change-Id: I988d7eefcb9a0856ef61496610eac26b29aefa7d
Jakub Pawlowski [Sat, 25 Jun 2016 00:06:41 +0000 (17:06 -0700)]
Simplify GATT characteristic read memory handling
Pass read result in a fixed sized array instead of a pointer.
This eliminates the need for any special memory management in btif.
Change-Id: I2a33d74b12f3059050855c9fc90fff785cc985ba
Andre Eisenbach [Mon, 27 Jun 2016 23:53:23 +0000 (23:53 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am:
d13870072e
Change-Id: I753967a57a3e460638ab904ad987beda96399975
Andy Hung [Mon, 27 Jun 2016 23:30:03 +0000 (23:30 +0000)]
Match socket buffer sizes between audio HAL and BT server am:
3d02215979
am:
753ef725b9
Change-Id: Ibb2fd3f2ac5b07c61f03f5fd8b649f22ca48b688
Andy Hung [Mon, 27 Jun 2016 23:24:38 +0000 (23:24 +0000)]
Match socket buffer sizes between audio HAL and BT server
am:
3d02215979
Change-Id: Id4e09877ebba3a3096bde0a59e8c4c5dc7a26051
Andre Eisenbach [Mon, 27 Jun 2016 22:49:53 +0000 (15:49 -0700)]
Add Subaru and Nissan car kits to auto pair blacklist
Bug:
29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8
Andy Hung [Wed, 4 May 2016 22:47:05 +0000 (15:47 -0700)]
Match socket buffer sizes between audio HAL and BT server
Adjust our mixer buffer size to be one quarter that of
the socket buffer size for quadruple buffering.
Increase socket buffer size from 20*512 to 28*512 to
smooth out variability in data draw from AudioFlinger.
Bug:
28286313
Change-Id: I8a9ca9e1f4639a0724cfe126acc670c2058cb0fb
(cherry picked from commit
e97d975cce213b8c6e4f69bc3fc75411a1743647)
Andre Eisenbach [Fri, 24 Jun 2016 23:54:36 +0000 (23:54 +0000)]
A2DP media task: Flush full TX queue on congestion
am:
d881c4b467
Change-Id: I4e15610487705635ece8fb6bd727c320dfaacd7a
Andre Eisenbach [Thu, 23 Jun 2016 23:14:53 +0000 (16:14 -0700)]
A2DP media task: Flush full TX queue on congestion
Currently, our TX queue does not allow for quick recovery of minor
congestion. As we only clear as much room in the queue as is needed to
fix the news frames needed for a given timer tick, any minor congestion
on the TX path can result in single frames to be dropped over an
excessively long amount of time.
From the "just rip the band-aid off" school of thought, drop the whole
queue instead to cause a single drop-out on congestion and catch up to
the live stream immediately, hoping that the stream recovers...
Bug:
29601962
Change-Id: I482c3cfef6d8b51143e54733eb2da5f70663636f
Jakub Pawlowski [Fri, 24 Jun 2016 22:56:10 +0000 (22:56 +0000)]
Get rid of unused BTA_DYNAMIC_MEMORY am:
25984b0d22
am:
88eb96fd30
Change-Id: Idcbb1232a2fbd1b253ad9d5daeea990ff21dea3c
Jakub Pawlowski [Fri, 24 Jun 2016 22:54:19 +0000 (22:54 +0000)]
Get rid of unused BTA_DYNAMIC_MEMORY
am:
25984b0d22
Change-Id: I182b5b707f6537c8c50cb5cac794ecedebc45b4d
Andre Eisenbach [Fri, 24 Jun 2016 21:53:22 +0000 (14:53 -0700)]
resolve merge conflicts of
6b142ed to nyc-dev-plus-aosp
Change-Id: I222ff056f7ba91903a60f1ef6958b6e4ec6f7f79
Jakub Pawlowski [Fri, 24 Jun 2016 21:39:28 +0000 (21:39 +0000)]
Use bta_gattc_cb directly, not through aliases am:
a05734c69c
am:
de22f90d28
Change-Id: I210d6bdb64a073a61c82420bb995cec88d1e2ccf
Jakub Pawlowski [Fri, 24 Jun 2016 21:37:32 +0000 (21:37 +0000)]
Use bta_gattc_cb directly, not through aliases
am:
a05734c69c
Change-Id: Iefcdc6e3ea4504e859464e778e6ca88222fc379b
Andre Eisenbach [Fri, 24 Jun 2016 21:15:01 +0000 (21:15 +0000)]
Remove log spam in btif_gattc_update_properties
am:
ffdb33b5fc -s ours
Change-Id: I4ec69857999b0d7c89596a02386f796f50388ba7
Jakub Pawlowski [Fri, 24 Jun 2016 21:05:58 +0000 (14:05 -0700)]
Get rid of unused BTA_DYNAMIC_MEMORY
Change-Id: Idc7fcddfecac9ab7d9800b496e2380ae277f357f
Jakub Pawlowski [Fri, 24 Jun 2016 20:36:01 +0000 (13:36 -0700)]
Use bta_gattc_cb directly, not through aliases
Right now, bta_gattc_cb is not used directly, instead it's passed as
argument to methods that can use it directly.
Change-Id: I54fef4b8b1e11b3289e7961f70bea187173e9804
Andre Eisenbach [Fri, 24 Jun 2016 17:16:52 +0000 (17:16 +0000)]
Merge "Remove SBC frame scrambling" into nyc-dev
Andre Eisenbach [Thu, 23 Jun 2016 22:25:44 +0000 (15:25 -0700)]
Remove SBC frame scrambling
Bug:
29601962
Change-Id: I30ce09f1c7550a1be9fd1c8ed70745f9aa0cdb44
Andre Eisenbach [Thu, 23 Jun 2016 21:22:35 +0000 (14:22 -0700)]
Remove log spam in btif_gattc_update_properties
Bug:
29601962
Change-Id: I4a86b786609b0203a72b750a1c4a38c82fcc5f97
Marie Janssen [Wed, 22 Jun 2016 22:39:47 +0000 (22:39 +0000)]
resolve merge conflicts of
b7f64bc to stage-aosp-master
am:
649e13fbfb
Change-Id: I74fb93559793619a604f7ab442b0274ed3e3fd27
Marie Janssen [Wed, 22 Jun 2016 22:24:37 +0000 (15:24 -0700)]
resolve merge conflicts of
b7f64bc to stage-aosp-master
Change-Id: I8359cd1895d6a0e49e834a8f45823865617a207d
Marie Janssen [Wed, 22 Jun 2016 19:52:19 +0000 (12:52 -0700)]
btif: standardize types, #ifs
Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Change-Id: Ic29d1d0b32c3ca9953752a4e5da6c28f45ec8895
Sharvil Nanavati [Wed, 22 Jun 2016 01:26:32 +0000 (01:26 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours am:
8e80a26078 am:
edb7ce120e
am:
c4bc5d2c5a
Change-Id: Idc155f2aaaf932a64da86c9c82c9a787ac460807
Sharvil Nanavati [Wed, 22 Jun 2016 01:19:12 +0000 (01:19 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours am:
8e80a26078
am:
edb7ce120e
Change-Id: Ie7ea41474e11479b54ba526294977dfaa60c8cd7
Sharvil Nanavati [Wed, 22 Jun 2016 01:16:24 +0000 (01:16 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours
am:
8e80a26078
Change-Id: I54a690024ccd316058d9d59ff7b16206f7fcd543
Sharvil Nanavati [Wed, 22 Jun 2016 01:13:44 +0000 (01:13 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev
am:
f15ca6d21d -s ours
Change-Id: Ic1a23e2c6d0284b9fdf346a681f59cdcbaa599e0
Jakub Pawlowski [Wed, 22 Jun 2016 00:58:05 +0000 (00:58 +0000)]
GATT: use one type for all server attributes am:
c88b20a599
am:
a8fac50181
Change-Id: I123297945ebe03d7f139b51437a16909d984b44b
Jakub Pawlowski [Wed, 22 Jun 2016 00:55:55 +0000 (00:55 +0000)]
GATT: use one type for all server attributes
am:
c88b20a599
Change-Id: I56b557fa9e13ca95e375ead0ad298357f6e5f564
Jakub Pawlowski [Tue, 21 Jun 2016 23:16:09 +0000 (16:16 -0700)]
GATT: use one type for all server attributes
Right now we have three types, for attributes depending on how long
the uuid is. Instead, use one type.
Change-Id: I33bb4f3c57b7b1516eda871a77b71661b7ba39ce
Sharvil Nanavati [Tue, 21 Jun 2016 22:56:42 +0000 (15:56 -0700)]
resolve merge conflicts of
1f433cb to mnc-dr-dev
Change-Id: I7278875d21c59316217cb1b99d902f4fc248ca06
Sharvil Nanavati [Tue, 21 Jun 2016 02:16:12 +0000 (19:16 -0700)]
DO NOT MERGE Fix potential DoS caused by delivering signal to BT process
Bug:
28885210
Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360
IHLHO KIM [Mon, 20 Jun 2016 22:59:19 +0000 (22:59 +0000)]
Merge \\"Remove unused \\"cmn_ble_vsc_cb\\"; causing extended scan to not start\\" am:
844c999757
am:
68d7b7d1cc
Change-Id: I85c6c8799ef589841fdee9885740994d6a2ec4d1
IHLHO KIM [Mon, 20 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge \"Remove unused \"cmn_ble_vsc_cb\"; causing extended scan to not start\"
am:
844c999757
Change-Id: Id948c9a86af0dab86fd936753df5ea4172fe77cb
Treehugger Robot [Mon, 20 Jun 2016 22:53:14 +0000 (22:53 +0000)]
Merge "Remove unused "cmn_ble_vsc_cb"; causing extended scan to not start"
Jakub Pawlowski [Mon, 20 Jun 2016 22:42:48 +0000 (22:42 +0000)]
Vectors as parameters to GATT (1/3) am:
16102de086
am:
8350568c63
Change-Id: I9022867786932320f775a1adfa00efbe90f0fa84
Jakub Pawlowski [Mon, 20 Jun 2016 22:37:32 +0000 (22:37 +0000)]
Vectors as parameters to GATT (1/3)
am:
16102de086
Change-Id: Iddbc25e849a4c53c608694dab06ffd48a3fb01e3
Jakub Pawlowski [Tue, 31 May 2016 20:14:13 +0000 (13:14 -0700)]
Vectors as parameters to GATT (1/3)
Bug:
29005882
Bug:
28485365
Change-Id: I0a5041073a39977c4fbc29879c383fa6720da641
IHLHO KIM [Wed, 15 Jun 2016 05:27:53 +0000 (05:27 +0000)]
Remove unused "cmn_ble_vsc_cb"; causing extended scan to not start
The local variable "cmn_ble_vsc_cb" is referenced instead of btm_cb.
This causes generic LE scans to be used even though the controller
supports extended scans.
Change-Id: I8b1d817d4d04ee3a8db4285998b5a1916d046ccc
Marie Janssen [Mon, 20 Jun 2016 20:52:01 +0000 (20:52 +0000)]
bta: use standard types am:
e9e58ced19
am:
04c2ce1d6e
Change-Id: I975fd04d3fb7645c16aa94e9280c4f2b13727c44
Marie Janssen [Mon, 20 Jun 2016 20:50:11 +0000 (20:50 +0000)]
bta: use standard types
am:
e9e58ced19
Change-Id: Ie6be3d3ca5b0995c85becd1ef351d11deb773169
Marie Janssen [Fri, 17 Jun 2016 21:12:17 +0000 (14:12 -0700)]
bta: use standard types
Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Fix some debug statements to use __func__
Change-Id: Ib86de4de9f14529ecaa4f71597260e3b5785360b
Jakub Pawlowski [Mon, 20 Jun 2016 18:11:41 +0000 (18:11 +0000)]
Vectors as parameters to GATT write/indicate (1/3) am:
ec79baaaed
am:
7e485025df
Change-Id: Icb9765a7a4ef16f96da32fdc37a8388cf3aee75d
Jakub Pawlowski [Mon, 20 Jun 2016 18:10:57 +0000 (18:10 +0000)]
Use vector instead of C arrays in bta_gatt_api am:
26ecec06be
am:
7d1f7ebf01
Change-Id: Idf14b331605f790ac470097506197165d1bf034a
Jakub Pawlowski [Mon, 20 Jun 2016 18:05:39 +0000 (18:05 +0000)]
Vectors as parameters to GATT write/indicate (1/3)
am:
ec79baaaed
Change-Id: I5a9e1abb17e06945a13c4afd883f439befc64424
Jakub Pawlowski [Mon, 20 Jun 2016 18:05:38 +0000 (18:05 +0000)]
Use vector instead of C arrays in bta_gatt_api
am:
26ecec06be
Change-Id: I04cb40c4ae5c61f548a4878cee6a3084950392a3
Matadeen Mishra [Mon, 20 Jun 2016 18:05:13 +0000 (18:05 +0000)]
L2CAP: Handle invalid HCI packets
am:
92e0f19ff0
Change-Id: Ib7ffac0632de84d8f0099eeef3dabbb94a101b7f
Jakub Pawlowski [Fri, 27 May 2016 22:48:03 +0000 (15:48 -0700)]
Vectors as parameters to GATT write/indicate (1/3)
This changes are covered in test cases:
GattReadTest.*
GattWriteTest.*
Bug:
29005882
Bug:
28485365
Change-Id: I1409e6ead22ff691190f9ea4c3ffe2267bd3bf33