OSDN Git Service
Pavlin Radoslavov [Thu, 13 Jul 2017 18:30:14 +0000 (18:30 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7 am:
c18777c2e6
am:
e562fc49d3
Change-Id: I35d5a9719f2f554d4211b597cd776ec66824f062
Pavlin Radoslavov [Thu, 13 Jul 2017 18:29:57 +0000 (18:29 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours
am:
4115bbb8f5 -s ours
Change-Id: Idb37536609bac94fa1dfb001c5e63d765ad0e9ee
Pavlin Radoslavov [Thu, 13 Jul 2017 18:29:39 +0000 (18:29 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours
am:
c464bfcd50 -s ours
Change-Id: I97811392efb8e88411006d43d4d499599392f682
Pavlin Radoslavov [Thu, 13 Jul 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7
am:
c18777c2e6
Change-Id: I8e30d779ab33a28a6e11f8671a490e92b55fe2da
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours
am:
2fcebaa235 -s ours
Change-Id: I8c0a6e3e8fdafb24739a9f267b944507b287db91
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:40 +0000 (18:26 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours
am:
9005269de3 -s ours
Change-Id: Ia2e716810d7a667becfe79b5ce5995225ed57648
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:21 +0000 (18:24 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd
am:
f4cca28ce7
Change-Id: I634762cc7468a03ca94702153dc638ac5506d20a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:04 +0000 (18:24 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours
am:
a6996df21f -s ours
Change-Id: Icef81edd5fec2d5edee0af3c02f4b85ea75a9d0f
Pavlin Radoslavov [Thu, 13 Jul 2017 18:23:39 +0000 (18:23 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours
am:
f79aebe2b9 -s ours
Change-Id: I98be6f0d6399502bbf523e3531865a608111c076
Pavlin Radoslavov [Thu, 13 Jul 2017 18:21:15 +0000 (18:21 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089
am:
634fc84bbd
Change-Id: I35386fe81935831e344265a879e8ee2bc05e4dc7
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:57 +0000 (18:20 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8
am:
8ec036d751 -s ours
Change-Id: I3735cfa1430daf543d5cbfdb1609176443feba86
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:40 +0000 (18:20 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453
am:
c80b2fc096 -s ours
Change-Id: I143dcc7f5db0b852b596eeb62ac78f1beda40b3c
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0
am:
da8e592089
Change-Id: Ibc97e933ab9dbcb262753946ca0bad8ed3fe716d
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7
am:
84714e10d8
Change-Id: I1a88047cdf70026aaa57f747e4ce614b1d496df0
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:09 +0000 (18:18 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7
am:
5d9bbfe453
Change-Id: I0d39c39b4b573b7df297ed1d93191aff18712fec
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:35 +0000 (18:16 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9
am:
70ef60cac0
Change-Id: I17a95052722739e6329e9759fafe1c0a7acfa067
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:22 +0000 (18:16 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e
am:
27db9becc7
Change-Id: I5a5ea407d003fc297ee89837ff22fcc0d946c735
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948
am:
b4cf6c5aa7
Change-Id: I915ceaf816dc806ba91da7791aa1b43460615935
Pavlin Radoslavov [Thu, 13 Jul 2017 18:14:11 +0000 (18:14 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev
am:
b5cb6103b9
Change-Id: I12c131aa3543e524f669f038153de2dbcd6ca63a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
am:
d2a3649d6e
Change-Id: I781ce0eb5e6ea5b8b8fb029afe6caf81bd9ca9fb
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:38 +0000 (18:13 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote
am:
f7a7f7a948
Change-Id: I5d1c8050de38dde922f9891e70574205422ee7be
Pavlin Radoslavov [Thu, 13 Jul 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9 am:
cf3547d9a2
am:
0141629f97
Change-Id: I8635a23f75175bcde855ddf925ce2da0efd7de2b
Pavlin Radoslavov [Thu, 13 Jul 2017 18:11:07 +0000 (18:11 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62
am:
6a44d1821b
Change-Id: Idfaeec3e29c40905e50e69df944134e403d41a1b
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:51 +0000 (18:08 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9
am:
cf3547d9a2
Change-Id: Ia5a9015eb954fd331c2a06120456b98baafc0f17
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:37 +0000 (18:08 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7
am:
5da7401f62
Change-Id: I551622b60e882a85a9c739ec22d08a5af55cb1c9
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:58 +0000 (18:06 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev
am:
ee18c2bdd9
Change-Id: I077fed75c11c360dd38d4988f08dca4dd8ddf604
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:36 +0000 (18:06 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
510697a0d7
Change-Id: I5ca796fc392413dbf7f89332d1172904f980fab5
TreeHugger Robot [Thu, 13 Jul 2017 18:05:09 +0000 (18:05 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:04:48 +0000 (18:04 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:02:23 +0000 (18:02 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
(cherry picked from commit
f7a7f7a948e38195e8ca897785ac5d489082f0cc)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
(cherry picked from commit
338e0485940ab278e6a2dc12285ba0798b79cfa4)
Pavlin Radoslavov [Thu, 13 Jul 2017 01:56:03 +0000 (18:56 -0700)]
Add missing continuation offset check for SDP continuation requests
Bug:
63146698
Test: External script
Change-Id: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
Merged-In: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
(cherry picked from commit
e776c834768bedd043ace7e5714390b61c96a248)
(cherry picked from commit
10ce685cb025f6854be4ecc5329f2f684fd9ea5d)
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
Yamei Du [Wed, 18 Nov 2015 09:28:07 +0000 (17:28 +0800)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
FW ACL buffer overflow.
One more ACL packet was sent to FW which is unexpected.
fix l2cap TX control defect.
Call fixed channel TX complete cb after packets is send to lower.
Bug:
26763700
Tested: manual
Change-Id: Iaba14a11c1583da2a72769ebd096e0baedf857c3
CR-Id: ALPS02404396
Ruina Liu [Thu, 24 Sep 2015 02:04:16 +0000 (10:04 +0800)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist
In scenario where BREDR/BLE links coexist, and BLE
transport is doing round-robin but BREDR transport is
not use round-robin, when uplayer trigger to transmit
BLE data, the BREDR lcb_pool with smaller array index
will break the for loop firstly. This can block the
L2cap packets transmission of the following BLE lcb_pool
even though there is available BLE controller buffer.
If BLE_INCLUDE is TRUE, then BREDR/BLE links maybe
coexist, change break to continue statement, so the
data transmission will not be blocked by the other
transport type in round-robin case.
Change-Id: I7ca739dfbf02acd2e30527c16ca616a7bad70c51
CR-Id: ALPS02303646
TreeHugger Robot [Tue, 30 May 2017 21:00:28 +0000 (21:00 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev
Andre Eisenbach [Thu, 3 Nov 2016 21:53:49 +0000 (14:53 -0700)]
DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb
|data| may be NULL if the RSSI request times out.
See btm_read_rssi_timeout implementation for details.
Bug:
32587130
Test: manual
Change-Id: Ide9dee819e1db24a39c05b086cd4c0b558ca23ef
Jacky Cheung [Wed, 10 May 2017 21:23:06 +0000 (14:23 -0700)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation
At the time of connection, the idle timeout could have been set to a fixed
value, which is likely to be related to the completion of service discovery
after bonding. A check on ACL link allows the idle timeout to be reset to no
timeout, which would eliminate local host disconnections observed due to
idle timeouts.
Bug:
37352720
Test: manual
Change-Id: Ie0b24b83020d502cf7c55421a27659215253b4d2
Sridhar Vashist [Fri, 28 Oct 2016 18:37:49 +0000 (13:37 -0500)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links.
3DH packets have a lower tolerance to background noise. A2DP requiring higher
bandwidth & realtime playback is especially suscepitble in this scenario.
Bug:
37515006
Test: oem manual
Change-Id: Id4d7452a86fe864eceb88a9fb16a40dc921a1e13
Jacky Cheung [Sat, 29 Apr 2017 03:48:18 +0000 (03:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev
Jakub Pawlowski [Thu, 27 Apr 2017 11:52:34 +0000 (04:52 -0700)]
DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing
When a device connect to android over LE, the default policy is to keep
this connection. If any app "claims" this connnection, and then stop
using it, we'll disconnect from the device after a short timeout.
If pairing is triggered to such device, that is connected but not used
by any app, it will cause disconnect after the pairing is finished. This
is because using SMP over fixed LE L2CAP channel is conseidered as
connecting, using, and disconnecting a channel by the stack. This is
obvious logic error - using fixed channels should not require
"connecting" to them.
As a temporary workaround, do not trigger a timeout when a fixed SMP
channel is closed over LE.
For LE only devices, this means they will stay connected after the
pairing until some app starts using them or they disconnect. For dual
mode devices, Classic connection will be established and SDP will be
performed. The classic connection will be disconnected if no app will
use it, and the LE connection to the device will stay up.
Bug:
37352720
Test: manual
Change-Id: Ic9d688aacf84e0267277b12b28dfa7cc57fdcea6
(cherry picked from commit
7c8bab231328956d3b7569280cb162be4e345422)
Zach Johnson [Fri, 21 Apr 2017 20:58:11 +0000 (20:58 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy" into cw-f-dev
Zach Johnson [Wed, 19 Apr 2017 04:03:07 +0000 (21:03 -0700)]
DO NOT MERGE ANYWHERE Allow blocking AG SCO connects by policy
Needed for devices that support both HFP AG and HFP HF.
btsnoop logs show the sequence of events leading to failure:
(corroborated by bt logcat)
1. ACL connection with remote phone established on handle 0x01
2. ACL connection with remote headset established on handle 0x02
3. Incoming call in HF role from phone
4. Phone call locally published to telecom
5. Answer incoming call
6. SCO connection established with phone in HF role
7. AG role with headset picks up on call state change to answered
via BTA_AG_IN_CALL_CONN_RES
8. Inside handler for BTA_AG_IN_CALL_CONN_RES, bta_ag_sco_open called
to establish the SCO connection in the AG role with the headset,
stomping on the previous (wanted) SCO connection with the phone.
Fix is to publish the SCO audio route policy to fluoride, so we can
stop 8 from happening.
Bug:
32958838
Test: manual:
received incoming call in HF role, audio worked both ways;
recieved incoming MT call, headset audio in AG role worked both ways
Change-Id: I12961598e8200bd1d5adb46ee8ec3a802114b80a
Jacky Cheung [Fri, 14 Apr 2017 20:49:23 +0000 (13:49 -0700)]
Do not GATT_ERROR on MTU change
Bug:
37305498
Test: manual on MSM8909
Change-Id: Iabec87375da1e8cd05356a7be490a66205d24e78
Jack He [Tue, 11 Apr 2017 22:33:09 +0000 (22:33 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6 am:
e6620d18cf am:
585e0c08f5 am:
005eb1d305 am:
7752061901 am:
0ddb124e6e
am:
2feb43b5b1
Change-Id: I3d16a2939976a326ca20056b29818e2df550ee67
Jack He [Tue, 11 Apr 2017 22:28:08 +0000 (22:28 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6 am:
e6620d18cf am:
585e0c08f5 am:
005eb1d305 am:
7752061901
am:
0ddb124e6e
Change-Id: I61b9f5741d5fd6035fb7d472b83dc9df54eb3483
Jack He [Tue, 11 Apr 2017 22:23:08 +0000 (22:23 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6 am:
e6620d18cf am:
585e0c08f5 am:
005eb1d305
am:
7752061901
Change-Id: I1f821df2a72958ed17ce5bf8baed431a52dfb087
Jack He [Tue, 11 Apr 2017 22:18:07 +0000 (22:18 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6 am:
e6620d18cf am:
585e0c08f5
am:
005eb1d305
Change-Id: Ic4f826e4f963f969c360fe39c6e720c3fb013d23
Jack He [Tue, 11 Apr 2017 22:13:06 +0000 (22:13 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6 am:
e6620d18cf
am:
585e0c08f5
Change-Id: If70a5f9b56845e758c2a2a3150936a72cac9f438
Jack He [Tue, 11 Apr 2017 22:08:06 +0000 (22:08 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6
am:
e6620d18cf
Change-Id: I412c0dd7854d7f6157e1974e285078909543bb41
Jack He [Tue, 11 Apr 2017 22:03:05 +0000 (22:03 +0000)]
Check LE advertising data length before caching advertising records
am:
1bef3546a6
Change-Id: Ibbf6183833d7f00937742fa337a04569c4ef3c2f
Jack He [Thu, 6 Apr 2017 00:59:58 +0000 (17:59 -0700)]
Check LE advertising data length before caching advertising records
Bug:
33899337
Test: make, receive LE advertising
Change-Id: I06b249ac5cabdef64528deda07b8bae749e1d2fd
(cherry picked from commit
d57adbc350fdee4f27b82c9e39a14bd745d92320)
Jacky Cheung [Fri, 17 Mar 2017 17:21:40 +0000 (10:21 -0700)]
DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection param update
In the case that AutoConnParamUpdateAddr is missing, the first LE address
that performs the connection parameter update is inferred as the companion.
The address is recorded in AutoConnParamUpdateAddr.
BUG:
34693438
Change-Id: I2a6e0b10a4debe1e5f36052f67864854da0b3e47
Pavlin Radoslavov [Wed, 15 Mar 2017 05:53:21 +0000 (05:53 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064 am:
b75b8e7f1a
am:
d4f1f0e048
Change-Id: Id111ef66d83a3427ccc8272115ef3191221ee3cc
Pavlin Radoslavov [Wed, 15 Mar 2017 05:47:20 +0000 (05:47 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064
am:
b75b8e7f1a
Change-Id: Iab4d37c1e43d62d9132ebf090ac43284f8b668a8
Pavlin Radoslavov [Wed, 15 Mar 2017 05:41:49 +0000 (05:41 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
am:
a33dd28064
Change-Id: I081f113d8908bb775f56c25beb105a3311b0affb
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
Bug:
34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
Pavlin Radoslavov [Tue, 14 Mar 2017 21:10:16 +0000 (21:10 +0000)]
Check the HCI length before extracting the L2CAP length and CID am:
33c68c82c1 am:
172f0d8f7c
am:
ca64d3d38b
Change-Id: I239b72b4cc81728c3e859b7f4efcb820c9d8fef9
Pavlin Radoslavov [Tue, 14 Mar 2017 21:05:16 +0000 (21:05 +0000)]
Check the HCI length before extracting the L2CAP length and CID am:
33c68c82c1
am:
172f0d8f7c
Change-Id: Ifb002936f93d85d635ab76ddf52c0ddb44cb9d3e
Pavlin Radoslavov [Tue, 14 Mar 2017 20:59:46 +0000 (20:59 +0000)]
Check the HCI length before extracting the L2CAP length and CID
am:
33c68c82c1
Change-Id: I1f94530ef90162747ef6a62c3a601856ea1d6672
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID
Bug:
34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit
ecc0835114cbae3033d8b0e25bd8b443880d5077)
Jacky Cheung [Tue, 10 Jan 2017 18:02:33 +0000 (18:02 +0000)]
Merge "Serialize stack shutdown, state change callback and cleanup" into cw-f-dev
Andre Eisenbach [Mon, 9 Jan 2017 23:05:41 +0000 (23:05 +0000)]
Remove position dependent lookup tables in AT command parser
am:
8d3cf5988a
Change-Id: I0a690f1538c49fbed743ccf324d240dbb8c927c8
Gurpreet Ghai [Mon, 12 Sep 2016 12:06:53 +0000 (17:36 +0530)]
Serialize stack shutdown, state change callback and cleanup
Use Case: Bluetooth On/Off scenario, User switch
Steps:
1. Turn ON Bluetooth
2. Switch user
Also observed on occurrence of enable/disable timeout during On/Off testing.
Failure: Crash while sending state change HAL callback.
Root Cause: In the event when stack cleanup is queued to stack manager
thread when stack shutdown is being processed, stack cleanup starts
execution as soon as stack shutdown is finished.
If the function event_signal_stack_down posted to btif thread at the
end of stack shutdown is executed after stack cleanup crash occurs.
Fix: Serialized the execution of stack shutdown, state change callback
execution and stack cleanup to happen in same order.
Test: code compilation.
Change-Id: Ic96205b5c304acb44eab53f4e2cb150726643bda
(cherry picked from commit
16e112b1861d8f1147325372608c905627e00e88)
Andre Eisenbach [Sat, 23 Jul 2016 06:15:11 +0000 (23:15 -0700)]
Remove position dependent lookup tables in AT command parser
The various position dependent lookup tables in the AT command parser
were out of sync, causing invalid responses to the AT+CBPS command for
example.
This patch gets rid of positionally dependent enums for simple lookup
tables that correlate all the values for easier, less error prone
maintenance of the related tables.
This re-instates a previously reverted patch after fixing incorrect
field order in tBTA_AG_INDICATOR_MAP.
Change-Id: I7f8a052e78706c8c72c5102b38cfe9ce200ae0d9
Fixes:
29978908
Ben YoungTae Kim [Mon, 23 May 2016 23:15:07 +0000 (16:15 -0700)]
DO NOT MERGE ANYWHERE Fix the timestamp in btsnoop format
Due to overflow, timestamp does not have correct value.
Make sure it should be saved in long long type as 64bit.
Change-Id: Iaf1b1dd746dd52ab7e50b870efacde2b8dd0bed6
Signed-off-by: Ben YoungTae Kim <ytkim@qca.qualcomm.com>
Zheng Zhang [Wed, 23 Mar 2016 03:03:19 +0000 (11:03 +0800)]
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
In the bta_hf_client_sco_conn_cback function, sco_state should not be set to
BTA_HF_CLIENT_SCO_SHUTDOWN_ST when no matched peer_addr found, so that it
can handle BTA_HF_CLIENT_SCO_OPEN_E event later.
Bug:
26416310
Change-Id: I4540230c792490f79e4cca24cb4b34a1c383422f
(cherry-picked from
2dfcbda49f694fcf1355955c334926e8641b4dc5)
Andre Eisenbach [Tue, 8 Nov 2016 00:23:56 +0000 (00:23 +0000)]
Mask out HFP 1.7 feature bits if peer version is <1.7
am:
ebba3ef2ea
Change-Id: Ifba883eecdf6296d94f6181564e3fdf69ec5a452
Andre Eisenbach [Sat, 5 Nov 2016 00:43:17 +0000 (17:43 -0700)]
Mask out HFP 1.7 feature bits if peer version is <1.7
Bug:
32378402
Merged-In: I568e8c4c584d56d744cf7a30273feac1d8d4c4df
Change-Id: Iac8684bdfd02b18cce260bedefb829e8f7285361
(cherry picked from commit
1ad2678e2ff5fa3dbfae9dc76ab646db10794e4e)
(cherry picked from commit
571f23ca31cdbc87cae8c078b5885246dd779498)
Jacky Cheung [Fri, 28 Oct 2016 21:17:14 +0000 (14:17 -0700)]
DO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address
Auto adjust connection interval parameter after a certain idle
period on the connection.
BUG:
32380838
Change-Id: I28cf4f6d5dcfb7a0bfb6aa652d939e16fbdcdcde
Jacky Cheung [Fri, 28 Oct 2016 18:47:11 +0000 (11:47 -0700)]
DO NOT MERGE ANYWHERE LE Connection Parameter Update Callback
The callback ends at the btif layer and does not go up to the HAL layer.
Event logging is added to track success rate.
BUG:
28800115
Change-Id: I73ad281437760e1d61dd4e504401b270eb77e3e6
Jakub Pawlowski [Tue, 25 Oct 2016 20:53:26 +0000 (20:53 +0000)]
Fix random crashes in HID related code
am:
e318faa73a
Change-Id: I134f5f63052d7173b106422cebda1c9987c15e4a
Jakub Pawlowski [Mon, 24 Oct 2016 22:00:12 +0000 (15:00 -0700)]
Fix random crashes in HID related code
Operation on characteristics/descriptors shouldn't access GATT database
when it's executed. This could happen while service rediscovery is in
progress.
Bug:
32240759
Test: connect to HID device
Change-Id: Ie2b6e6b451456204b1cea1e500df9a0ff949a9ef
(cherry picked from commit
d8f09d077d9017a522c17f4b9a49328b0ed3e91e)
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: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
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
Zach Johnson [Wed, 12 Oct 2016 17:08:27 +0000 (17:08 +0000)]
Merge "Fix HFP AT command BIA failures" into cw-f-dev
Devin Kim [Wed, 7 Sep 2016 04:47:47 +0000 (13:47 +0900)]
Fix HFP AT command BIA failures
Running the PTE test case TC_AG_IIA_BV_01_I, a failure occurs due to
missing initialization of tBTA_AG_VAL.
Bug:
31325270
Test: PTS
Change-Id: I683eccd53d40e79ec03545166b18ffa1922f0fb2
Jakub Pawlowski [Tue, 4 Oct 2016 16:45:43 +0000 (16:45 +0000)]
Fix bad GATT client state machine state after successfull cache load
am:
f87953f1be
Change-Id: If89361b40bd9abf0150afa4ac2af1b02366eafc7
Jakub Pawlowski [Mon, 3 Oct 2016 20:25:01 +0000 (13:25 -0700)]
Fix bad GATT client state machine state after successfull cache load
If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.
Bug:
31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d
Andre Eisenbach [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Fix 100 LE device connection limitation
am:
013c32bf98
Change-Id: I64d57c1a19e41bcf35569eb707f58d31c9a54d63
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation
Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.
This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.
Bug:
31625900
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
Jakub Pawlowski [Tue, 27 Sep 2016 15:44:34 +0000 (15:44 +0000)]
Fix unnecessary error message during GATT discovery
am:
f2e3bea844
Change-Id: Ied4363b52980f4a1e146c6186ffe920770f65866
Jakub Pawlowski [Mon, 26 Sep 2016 21:05:18 +0000 (14:05 -0700)]
Fix unnecessary error message during GATT discovery
Bug:
31637098
Change-Id: Ib2545e7827bd338d2e22c88836818fce23e7a057
chaoyu.x.wu [Fri, 23 Sep 2016 19:56:34 +0000 (19:56 +0000)]
Fix the BLE connection failure with some mice
am:
58c27b48aa
Change-Id: I45bdf4a316fca554c8c85cefdb87cff0cd2d21e6
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice
If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.
This issue was already fixed in commit
2d41fe1c, but then it was
re-introduced in commit
444a8da8, which also removed comment explaining
the issue, added back in this patch.
Bug:
29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03
(cherry picked from commit
1ec17e06c73c67592aeda29e0aaa03580fdecce9)
Pavlin Radoslavov [Fri, 16 Sep 2016 21:55:29 +0000 (21:55 +0000)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event
am:
e1c8ed17c7
Change-Id: Ie4625f75dcfd71ae9740af80721a53be19045055
Pavlin Radoslavov [Wed, 14 Sep 2016 23:39:02 +0000 (16:39 -0700)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event
If the received HCI type is unknown, then log an event and abort.
The most likely reason for that to happen is if the UART stream
is corrupted. We cannot recover from that, and there is not much
else we can do.
Also, fixed a bug in an HCI-related unit test that was exposed
by the above change.
Bug:
31432127
Change-Id: Ia888c485f177af4962268bf8f593b27fd7a4b080
(cherry picked from commit
27ec0c7824cf67b8a36bf5391734e6d2fc6207e2)
Jakub Pawlowski [Fri, 16 Sep 2016 20:10:23 +0000 (20:10 +0000)]
Fix bad address type assumption
am:
1e688824d9
Change-Id: I522a7131368106919866b6f764eff43927a86124
Andre Eisenbach [Fri, 16 Sep 2016 20:09:59 +0000 (20:09 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" into nyc-mr1-dev
am:
654c6d13e5
Change-Id: I4ca7da856ba68edb44f9fd251d4f333590c98def
Jakub Pawlowski [Fri, 16 Sep 2016 20:09:59 +0000 (20:09 +0000)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
am:
5f98c2410f
Change-Id: Ic93722a25b865313ef94fcd84a7008b737f8a567
Jakub Pawlowski [Fri, 16 Sep 2016 20:09:44 +0000 (20:09 +0000)]
Fix NPE in l2cble_notify_le_connection
am:
5e61112a98
Change-Id: I6fbb661a7911c22b51952bfd54f5b342c9cb6b75
Jakub Pawlowski [Fri, 16 Sep 2016 15:03:16 +0000 (08:03 -0700)]
Fix bad address type assumption
LE related code should not use BTM_ACL_IS_CONNECTED, because it assumes
classic transport.
In this particular case, connection created event, which was result of
advertising, caused cancellation of "LE Create Connection".
Attempt to send "LE Create Connection Cancel" was checking if connection
is already established, but was failing to do so becuase
BTM_ACL_IS_CONNECTED was used instead of btm_bda_to_acl with proper
transport. This caused just created connection to be dropped.
Bug:
31442085
Change-Id: Ia345a3d00e8567160f4abb2a31c4130ee69d67a3
(cherry picked from commit
f5566938ba671329d91c84c30ab126fbcdfc16d7)
Andre Eisenbach [Fri, 16 Sep 2016 19:56:58 +0000 (19:56 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" into nyc-mr1-dev
Jakub Pawlowski [Thu, 15 Sep 2016 15:02:05 +0000 (08:02 -0700)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
Cancelling discovery was not handled properly in
btif_dm_search_services_evt and was causing crashes due to assert in
default case.
Bug:
31442085
Change-Id: If9a2c203730c9b06df5ff8d8e251f0c35addcb82
(cherry picked from commit
7df43240c4a7cf5ecd58a39f03d235bf52929d79)
Jakub Pawlowski [Thu, 15 Sep 2016 15:04:04 +0000 (08:04 -0700)]
Fix NPE in l2cble_notify_le_connection
Accessing p_lcb must be guarded with NULL check.
Bug:
31442085
Change-Id: I0f6e3f8e0247c5e8946c4d098f8a3ba442f5fb28
(cherry picked from commit
b4458c93d5b5d7e2c103166d71daff560ee1a978)
Andre Eisenbach [Fri, 16 Sep 2016 17:29:19 +0000 (17:29 +0000)]
Add security record for devices found through LE batch scan
am:
b4a5ec958f
Change-Id: I361aef8e79a9ef470b7e38bc71a30cf9104fa09f