OSDN Git Service
Jakub Pawlowski [Sat, 26 May 2018 15:25:01 +0000 (08:25 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab am:
532c9426ec -s ours am:
0b64bfb34b -s ours am:
eb928f907e -s ours am:
00d3321a16 -s ours
am:
713eec8948 -s ours
Change-Id: I2f1a34fcd7c3b7c541682effe2a4c2ea7ef9337c
Jakub Pawlowski [Sat, 26 May 2018 15:18:24 +0000 (08:18 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab am:
532c9426ec -s ours am:
0b64bfb34b -s ours am:
eb928f907e -s ours
am:
00d3321a16 -s ours
Change-Id: I3d2c329a704869715de8c12f7af953f01db9c17a
Jakub Pawlowski [Sat, 26 May 2018 15:12:50 +0000 (08:12 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab am:
532c9426ec -s ours am:
0b64bfb34b -s ours
am:
eb928f907e -s ours
Change-Id: I5c235b0ecbcd9111ee656b5eb62326904765bc87
Jakub Pawlowski [Sat, 26 May 2018 15:06:47 +0000 (08:06 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab am:
532c9426ec -s ours
am:
0b64bfb34b -s ours
Change-Id: I775c2463cea6d87f60ce10aa53c9f1729622a65c
Jakub Pawlowski [Sat, 26 May 2018 15:01:13 +0000 (08:01 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab
am:
532c9426ec -s ours
Change-Id: Iba3ee8429d5f63384d2f617913a326428ca48fde
Jakub Pawlowski [Sat, 26 May 2018 08:01:04 +0000 (01:01 -0700)]
[automerger skipped] GATT: Handle too short Error Response PDU am:
5fd33061c4 am:
65d0585259 -s ours am:
af1d636d9b -s ours am:
e2922d471e -s ours
am:
fcb3524d63 -s ours
Change-Id: I6abe138c1608d012fe6cc5518a2205a7ce34f826
Jakub Pawlowski [Sat, 26 May 2018 07:55:00 +0000 (00:55 -0700)]
[automerger skipped] GATT: Handle too short Error Response PDU am:
5fd33061c4 am:
65d0585259 -s ours am:
af1d636d9b -s ours
am:
e2922d471e -s ours
Change-Id: I26840f91e3d9109e8a4721342a403339e4ed8a5a
Sunny Kapdi [Sat, 26 May 2018 07:54:57 +0000 (00:54 -0700)]
A2DP Offload: Avoid Offload_start/stop from remote am:
33576935cf am:
6288fe26bf
am:
ffae822b24
Change-Id: I9502f3ed3f97b84bb2acb403e5d0803f2c8cb087
Jakub Pawlowski [Sat, 26 May 2018 07:49:25 +0000 (00:49 -0700)]
[automerger skipped] GATT: Handle too short Error Response PDU am:
5fd33061c4 am:
65d0585259 -s ours
am:
af1d636d9b -s ours
Change-Id: Idab42dcdf02077b50ef3b46761058d2997b01467
Sunny Kapdi [Sat, 26 May 2018 07:49:22 +0000 (00:49 -0700)]
A2DP Offload: Avoid Offload_start/stop from remote am:
33576935cf
am:
6288fe26bf
Change-Id: Id16187eaa8f5a0309c73d46bd1c60259c85040e6
Jakub Pawlowski [Sat, 26 May 2018 07:42:51 +0000 (00:42 -0700)]
[automerger skipped] GATT: Handle too short Error Response PDU am:
5fd33061c4
am:
65d0585259 -s ours
Change-Id: I2f91edd9d9c3b933690139621e5ce1e05fbc603a
Sunny Kapdi [Sat, 26 May 2018 07:42:48 +0000 (00:42 -0700)]
A2DP Offload: Avoid Offload_start/stop from remote
am:
33576935cf
Change-Id: If1641995dc0fbb5e442c5610f3470c2e542e1dbe
Jakub Pawlowski [Sat, 26 May 2018 07:36:48 +0000 (00:36 -0700)]
GATT: Handle too short Error Response PDU
am:
5fd33061c4
Change-Id: Idb329c5956132c13de53fd34cdbe0dc89efc1aa1
Android Build Merger (Role) [Sat, 26 May 2018 07:30:26 +0000 (07:30 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab
Change-Id: Ic8f13917ab7a7682aa352076d12f09ec575170ea
Android Build Merger (Role) [Sat, 26 May 2018 07:29:23 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64
Change-Id: I94a5085e6d4a16759253179d34194ad17885aabb
Android Build Merger (Role) [Sat, 26 May 2018 07:29:21 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4
Change-Id: I9dc6a8173995d2337c9e59ae6dbfc201143245e9
Android Build Merger (Role) [Sat, 26 May 2018 07:29:20 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523
Change-Id: Ie2a4ba49599805c63b4d3ad81d2b6b50e53c385f
Android Build Merger (Role) [Sat, 26 May 2018 07:29:18 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed
Change-Id: If0a5e66c97c1acb07555cd20c0a4bbed62e40a9a
Android Build Merger (Role) [Sat, 26 May 2018 07:29:16 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3
Change-Id: I5a24b2d428c69771380e3d6484f9770a3c8cf33e
Android Build Merger (Role) [Sat, 26 May 2018 07:29:15 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11
Change-Id: I43e8c151fffa381413347fa2429b4a996f432199
Android Build Merger (Role) [Sat, 26 May 2018 07:29:14 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2
Change-Id: I3edb3cd03b07aa7dba92f6d90026dd1c1e8d3b6b
Android Build Merger (Role) [Sat, 26 May 2018 07:29:12 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055
Change-Id: I1d7cb68481b798a0f59b8b8bdf6639f5fb1c5fea
Jakub Pawlowski [Wed, 23 May 2018 17:30:19 +0000 (10:30 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Joseph Pirozzo [Sat, 26 May 2018 06:06:07 +0000 (23:06 -0700)]
Inform AVRCP Controller before cleaning up. am:
35e9618558 am:
6bbc75bf4f
am:
c2d6c3a781
Change-Id: Iac16f1691aeeaeed1c8fddbd873eeae44c403d1d
Joseph Pirozzo [Sat, 26 May 2018 06:00:03 +0000 (23:00 -0700)]
Inform AVRCP Controller before cleaning up. am:
35e9618558
am:
6bbc75bf4f
Change-Id: Iecee4515b632770bc4f9c13f9a078d37564fbdff
Joseph Pirozzo [Sat, 26 May 2018 05:53:28 +0000 (22:53 -0700)]
Inform AVRCP Controller before cleaning up.
am:
35e9618558
Change-Id: I7a25750c7f5afa647a1706496d1941f2ac39261f
Sunny Kapdi [Fri, 25 May 2018 16:29:16 +0000 (09:29 -0700)]
A2DP Offload: Avoid Offload_start/stop from remote
When DUT is A2DP Source, and remote initiates start
we suspend it immediately. There is no need to do
Offload_start/stop in this case. Also, the offload
start/stop was coming out of sync here.
Bug:
80284000
Test: Manual
Change-Id: If54c28188e7432ebcba639cd2fbfe81536c2f2e6
Jakub Pawlowski [Wed, 23 May 2018 17:19:53 +0000 (10:19 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Jakub Pawlowski [Sat, 26 May 2018 04:51:57 +0000 (21:51 -0700)]
[automerger skipped] Merge "GATT: Handle too short Error Response PDU" into oc-mr1-dev am:
29befd94cf -s ours am:
5b0e1f119d -s ours
am:
9af8d9a2fe -s ours
Change-Id: Id274406efdba5b1baea825c4386a4ee31b6722c3
Jakub Pawlowski [Sat, 26 May 2018 04:46:52 +0000 (21:46 -0700)]
[automerger skipped] Merge "GATT: Handle too short Error Response PDU" into oc-mr1-dev am:
29befd94cf -s ours
am:
5b0e1f119d -s ours
Change-Id: I275298c30c315422358078deae48d60eaa47a10b
Jakub Pawlowski [Sat, 26 May 2018 04:41:18 +0000 (21:41 -0700)]
[automerger skipped] Merge "GATT: Handle too short Error Response PDU" into oc-mr1-dev
am:
29befd94cf -s ours
Change-Id: I04051b1a6a9846bbc2336fc2491eebacb26ad00f
TreeHugger Robot [Sat, 26 May 2018 04:32:17 +0000 (04:32 +0000)]
Merge "GATT: Handle too short Error Response PDU" into oc-mr1-dev
Jakub Pawlowski [Sat, 26 May 2018 04:13:29 +0000 (21:13 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980 am:
147da61cb8 -s ours am:
5c37e7f55e -s ours am:
243abd8835 -s ours am:
93e1510b93 -s ours
am:
51eac223a8 -s ours
Change-Id: I33dcd6bebf8c3d264156db9dd497b3c675b3bc05
Joseph Pirozzo [Fri, 25 May 2018 19:31:06 +0000 (12:31 -0700)]
Inform AVRCP Controller before cleaning up.
Move the JNI callback earlier in the procedure before the device info is
zeroed out such that the higher levels know which device disconnected.
Bug:
80265765
Test: Disconnect AVRCP and verify bluetooth_manager reports it is
disconnected.
Change-Id: I1c69341227f4c1c1662022a4a77e1752f6306d2e
Jakub Pawlowski [Sat, 26 May 2018 04:08:24 +0000 (21:08 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980 am:
147da61cb8 -s ours am:
5c37e7f55e -s ours am:
243abd8835 -s ours
am:
93e1510b93 -s ours
Change-Id: I172da104e56459ba308f2fc5044fece45569cad3
Jakub Pawlowski [Sat, 26 May 2018 04:02:49 +0000 (21:02 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980 am:
147da61cb8 -s ours am:
5c37e7f55e -s ours
am:
243abd8835 -s ours
Change-Id: I7f1e5d4a5fe7ac5ec5a2ee0bca3397713b434e06
Jakub Pawlowski [Sat, 26 May 2018 03:56:45 +0000 (20:56 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980 am:
147da61cb8 -s ours
am:
5c37e7f55e -s ours
Change-Id: I92119dcc397c342bc673ae219773e0db5ae2a8f4
Jakub Pawlowski [Sat, 26 May 2018 03:51:41 +0000 (20:51 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980
am:
147da61cb8 -s ours
Change-Id: Ie6defc0efc49dc58d3e2f7d262f2277a617d77c3
Android Build Merger (Role) [Sat, 26 May 2018 02:56:23 +0000 (02:56 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980
Change-Id: Id6fbc4d73a7b922ff9224850000a4a1f10b81050
Android Build Merger (Role) [Sat, 26 May 2018 02:50:31 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0
Change-Id: I55b0755496a55a6f1c5a84227104f6478f05d0b4
Android Build Merger (Role) [Sat, 26 May 2018 02:50:30 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71
Change-Id: I5516d1c6ec683898b459bf9ba9c57299404aa42f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:28 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9
Change-Id: Id9651d76b8cd1ab201f5f3024ea8f7b2d57de521
Android Build Merger (Role) [Sat, 26 May 2018 02:50:26 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed
Change-Id: If52d04ab58a88e517a559d11d4f876a2ba56d70f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:25 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742
Change-Id: I274a46dd9edf3810f47daf791e1dc69c6ba0504b
Android Build Merger (Role) [Sat, 26 May 2018 02:50:23 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8
Change-Id: Ib296956f3e5ff59ed7f02d61dcc6bf93e572c58f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:21 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d
Change-Id: Ib45cb979df156f9871bbe845dcd12d291681035e
Android Build Merger (Role) [Sat, 26 May 2018 02:50:19 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d
Change-Id: Ib457d90751151790f92abe23b38596c02f0a69af
Jack He [Sat, 26 May 2018 01:29:31 +0000 (18:29 -0700)]
HFP: Only advance BTIF queue for outgoing connections am:
f1466605c3
am:
8c94661b02
Change-Id: Id6b636c070950573fc4931d3a4623d610726ff7a
Jack He [Sat, 26 May 2018 01:24:57 +0000 (18:24 -0700)]
HFP: Only advance BTIF queue for outgoing connections
am:
f1466605c3
Change-Id: Ieb3922a34c8d73d23ade442a56d6ad91dc82c7c6
Jack He [Sat, 26 May 2018 01:18:46 +0000 (18:18 -0700)]
HFP: Only advance BTIF queue for outgoing connections am:
5d0728dcf9 am:
a10cdb3ccd
am:
59852752a6
Change-Id: Id0d984f7512c3a260ccd344035254967be6d122b
Jack He [Sat, 26 May 2018 01:18:32 +0000 (18:18 -0700)]
HFP: Fix ACL collision handling and WBS update am:
1c2fdca5d7 am:
ac609e1cc5
am:
db2c055925
Change-Id: I4fe6e5687fccefaaf6eec23dc6a5ee508c58c589
Jack He [Sat, 26 May 2018 01:14:08 +0000 (18:14 -0700)]
HFP: Only advance BTIF queue for outgoing connections am:
5d0728dcf9
am:
a10cdb3ccd
Change-Id: I4fc6c89e32327b9aa2256ea4c8c7bacf069be675
Jack He [Sat, 26 May 2018 01:13:58 +0000 (18:13 -0700)]
HFP: Fix ACL collision handling and WBS update am:
1c2fdca5d7
am:
ac609e1cc5
Change-Id: I3df3454845da38a252525d9f0ee8d02ffad80729
Jack He [Sat, 26 May 2018 01:09:01 +0000 (18:09 -0700)]
HFP: Only advance BTIF queue for outgoing connections
am:
5d0728dcf9
Change-Id: I4fd7faa5385bc44f3e85d979a2aca4657a8077ec
Jack He [Sat, 26 May 2018 01:08:54 +0000 (18:08 -0700)]
HFP: Fix ACL collision handling and WBS update
am:
1c2fdca5d7
Change-Id: I842425cb0e91368577f4c547aeec024f3cefbd54
Jack He [Fri, 25 May 2018 23:59:59 +0000 (16:59 -0700)]
Merge "HFP: Fix ACL collision handling and WBS update" into pi-dev am:
c9a04d0a3e
am:
81369679a3
Change-Id: Ifb586d19140d37cde7b29ce26a828270c19a9f08
Jack He [Fri, 25 May 2018 23:55:30 +0000 (16:55 -0700)]
Merge "HFP: Fix ACL collision handling and WBS update" into pi-dev
am:
c9a04d0a3e
Change-Id: I466aaac2ff4adb9d318616dffec9c0472367e1de
Jack He [Thu, 24 May 2018 22:53:27 +0000 (15:53 -0700)]
HFP: Only advance BTIF queue for outgoing connections
* Modify HFP btif layer to only advance queue when there is a
connection outcome for outgoing connections
* During an ACL collision, incoming connection may preempt outgoing
connection and come back to the upper layer in a separate control
block. In this case, we should not advance the btif queue until the
outgoing connection sends callback to the btif layer
* When RFCOMM connection is successful, but SLC connection failed, we
should also send callback to Java layer and advance the queue. We
should only do this when transition from RFCOMM connected to
Disconnected, not from SLC connected to Disconnected
* We should only advance the queue after sending connection state update
to Java layer
* This prevents the crash in connect_int() where we check for any
control block that is left in connecting state
Bug:
80251999
Test: connect HFP devices rapidly to trigger ACL collision
testplans/details/166812/3975
Change-Id: Iba3736c77d8ef4a4701896461042466c26bc4820
(cherry picked from commit
8ced3dfacba328b1260096b93b9e9e6f65929fe3)
TreeHugger Robot [Fri, 25 May 2018 23:36:36 +0000 (23:36 +0000)]
Merge "HFP: Fix ACL collision handling and WBS update" into pi-dev
Jack He [Thu, 24 May 2018 22:53:27 +0000 (15:53 -0700)]
HFP: Only advance BTIF queue for outgoing connections
* Modify HFP btif layer to only advance queue when there is a
connection outcome for outgoing connections
* During an ACL collision, incoming connection may preempt outgoing
connection and come back to the upper layer in a separate control
block. In this case, we should not advance the btif queue until the
outgoing connection sends callback to the btif layer
* When RFCOMM connection is successful, but SLC connection failed, we
should also send callback to Java layer and advance the queue. We
should only do this when transition from RFCOMM connected to
Disconnected, not from SLC connected to Disconnected
* We should only advance the queue after sending connection state update
to Java layer
* This prevents the crash in connect_int() where we check for any
control block that is left in connecting state
Bug:
80251999
Test: connect HFP devices rapidly to trigger ACL collision
testplans/details/166812/3975
Change-Id: Iba3736c77d8ef4a4701896461042466c26bc4820
Jack He [Fri, 25 May 2018 01:59:13 +0000 (18:59 -0700)]
HFP: Fix ACL collision handling and WBS update
* Correctly set control block handle when passing WBS event data to
upstream
* Correctly reject local outgoing connection when a colliding incoming
connection is connected to RFCOMM
* Add more logging to help with future debugging
Bug:
80251999
Test: connect HFP devices rapidly and toggle Bluetooth rapidly
testplans/details/166812/3975
Change-Id: I90616d70335ca68c40251fb722146924c4801cbe
Jack He [Fri, 25 May 2018 01:59:13 +0000 (18:59 -0700)]
HFP: Fix ACL collision handling and WBS update
* Correctly set control block handle when passing WBS event data to
upstream
* Correctly reject local outgoing connection when a colliding incoming
connection is connected to RFCOMM
* Add more logging to help with future debugging
Bug:
80251999
Test: connect HFP devices rapidly and toggle Bluetooth rapidly
testplans/details/166812/3975
Change-Id: I90616d70335ca68c40251fb722146924c4801cbe
(cherry picked from commit
275df40271331e3d1f11167c961890f2dfdc3eda)
Joseph Pirozzo [Fri, 25 May 2018 23:10:25 +0000 (16:10 -0700)]
Merge "Inform AVRCP Controller before cleaning up." into pi-dev am:
d51883c1f4
am:
7e84ff44ef
Change-Id: Ibe1b217c4bb1a72bad19d04f14113aff9969cc7c
Sunny Kapdi [Fri, 25 May 2018 23:09:37 +0000 (16:09 -0700)]
Merge "A2DP Offload: Avoid Offload_start/stop from remote" into pi-dev am:
050dccdc0b
am:
9f7f5b4771
Change-Id: Ia94a3089ee70ee254030828bcb2a344495f56a45
Joseph Pirozzo [Fri, 25 May 2018 23:02:21 +0000 (16:02 -0700)]
Merge "Inform AVRCP Controller before cleaning up." into pi-dev
am:
d51883c1f4
Change-Id: Ie7160c610d2fc42b918fc84d1a35bcb92c1ad70a
Sunny Kapdi [Fri, 25 May 2018 23:01:35 +0000 (16:01 -0700)]
Merge "A2DP Offload: Avoid Offload_start/stop from remote" into pi-dev
am:
050dccdc0b
Change-Id: I99d71538d25e2d1ed8c1b7b57deed53a8d0cdaa2
TreeHugger Robot [Fri, 25 May 2018 23:00:24 +0000 (23:00 +0000)]
Merge "Inform AVRCP Controller before cleaning up." into pi-dev
TreeHugger Robot [Fri, 25 May 2018 22:55:57 +0000 (22:55 +0000)]
Merge "A2DP Offload: Avoid Offload_start/stop from remote" into pi-dev
Jakub Pawlowski [Fri, 25 May 2018 22:42:46 +0000 (15:42 -0700)]
[automerger skipped] Add PDU size checks in process_service_search_attr_rsp am:
980f6427b1 am:
b7de2e7afb am:
4dceea74c6 -s ours am:
98c8048b86 -s ours
am:
ad16ef5639 -s ours
Change-Id: Id7bca434b843676af00e238e706b568141dc14cb
Jakub Pawlowski [Fri, 25 May 2018 22:35:22 +0000 (15:35 -0700)]
[automerger skipped] Add PDU size checks in process_service_search_attr_rsp am:
980f6427b1 am:
b7de2e7afb am:
4dceea74c6 -s ours
am:
98c8048b86 -s ours
Change-Id: I75d7588cf4e998d954009af5fcf882a345e54ef0
Jakub Pawlowski [Fri, 25 May 2018 22:30:49 +0000 (15:30 -0700)]
[automerger skipped] Add PDU size checks in process_service_search_attr_rsp am:
980f6427b1 am:
b7de2e7afb
am:
4dceea74c6 -s ours
Change-Id: Ib74d2f95105d7c2c9c9a3605d0873c216d3cf1ea
Jakub Pawlowski [Fri, 25 May 2018 22:26:44 +0000 (15:26 -0700)]
Add PDU size checks in process_service_search_attr_rsp am:
980f6427b1
am:
b7de2e7afb
Change-Id: Iefba89565fe0c2088498ce0faff09c1a39f8afc3
Jakub Pawlowski [Fri, 25 May 2018 22:21:11 +0000 (15:21 -0700)]
Add PDU size checks in process_service_search_attr_rsp
am:
980f6427b1
Change-Id: I08d0a722f3421a59ed81c1324062d35ebe5057bd
Jakub Pawlowski [Fri, 25 May 2018 21:24:33 +0000 (14:24 -0700)]
Merge "Linux build fix" am:
a0f3fa4b38 am:
1037ac9f66
am:
b361ad3d82
Change-Id: Ia9e7a10e7604cb1c07c531ea0a77473d60c8be5a
Jakub Pawlowski [Fri, 25 May 2018 21:19:59 +0000 (14:19 -0700)]
Merge "Linux build fix" am:
a0f3fa4b38
am:
1037ac9f66
Change-Id: Id6f058f1cd78128116dfb70e9860d8fdc0f23131
Jakub Pawlowski [Fri, 25 May 2018 21:15:54 +0000 (14:15 -0700)]
Fix log level - requesting MTU is not error am:
bb956ab96a am:
fc67ab0799
am:
c35cb1002c
Change-Id: Id9eb446bb8c48281eb93aff1929363e1acbf5442
Jakub Pawlowski [Fri, 25 May 2018 21:15:25 +0000 (14:15 -0700)]
Merge "Linux build fix"
am:
a0f3fa4b38
Change-Id: I78f0771341beaf344460ace0ec44ddf7702376df
Jakub Pawlowski [Fri, 25 May 2018 21:10:31 +0000 (14:10 -0700)]
Fix log level - requesting MTU is not error am:
bb956ab96a
am:
fc67ab0799
Change-Id: I0176ec625514226c482f606d0fa2c830c09d4599
Treehugger Robot [Fri, 25 May 2018 21:09:38 +0000 (21:09 +0000)]
Merge "Linux build fix"
Jakub Pawlowski [Fri, 25 May 2018 21:06:10 +0000 (14:06 -0700)]
Fix log level - requesting MTU is not error
am:
bb956ab96a
Change-Id: I6636695bfdcf1fb4c123ea8ff0b1bc6810fff3cf
Jakub Pawlowski [Thu, 24 May 2018 19:27:10 +0000 (12:27 -0700)]
Fix log level - requesting MTU is not error
Test: compilation
Change-Id: Idf99af22cf4d29f6fb3da08e86e36b3394617c4f
Joseph Pirozzo [Fri, 25 May 2018 19:31:06 +0000 (12:31 -0700)]
Inform AVRCP Controller before cleaning up.
Move the JNI callback earlier in the procedure before the device info is
zeroed out such that the higher levels know which device disconnected.
Bug:
80265765
Test: Disconnect AVRCP and verify bluetooth_manager reports it is
disconnected.
Change-Id: I1c69341227f4c1c1662022a4a77e1752f6306d2e
(cherry picked from commit
3ee0329420f1c26cbd37653f982b8cdc67d0cb35)
Sunny Kapdi [Fri, 25 May 2018 16:29:16 +0000 (09:29 -0700)]
A2DP Offload: Avoid Offload_start/stop from remote
When DUT is A2DP Source, and remote initiates start
we suspend it immediately. There is no need to do
Offload_start/stop in this case. Also, the offload
start/stop was coming out of sync here.
Bug:
80284000
Test: Manual
Change-Id: If54c28188e7432ebcba639cd2fbfe81536c2f2e6
Merged-In: If54c28188e7432ebcba639cd2fbfe81536c2f2e6
(cherry picked from commit
c2b928c8893ee376578769b64c5be332f03a9806)
Jakub Pawlowski [Fri, 25 May 2018 16:31:26 +0000 (09:31 -0700)]
Linux build fix
Test: compile on linux
Change-Id: I831df72da8bdec17c4d9c87ebdfb333024eb964c
Sunny Kapdi [Fri, 25 May 2018 13:24:25 +0000 (06:24 -0700)]
[automerger skipped] A2DP Offload: Don't crash on repeated endSession am:
1335d540f2 -s ours
am:
ad8e0b0d98 -s ours
Change-Id: Ief5e4288c95507cdcb999dcaa785adf2ce7f3d55
Subramanian Srinivasan [Fri, 25 May 2018 13:23:46 +0000 (06:23 -0700)]
Merge "GATT: Fix GATT error response for execute write" into pi-dev am:
576631d792
am:
2c96f2bfb8
Change-Id: I4ad6aa11b276a80ad6c1fa51e911bf4d11cf6059
Kim Low [Fri, 25 May 2018 13:22:48 +0000 (06:22 -0700)]
Merge "Add separate sniff mode settings for gamepads" am:
c372f42e22 am:
3dd82fc86c
am:
ef435ad4fe
Change-Id: Id174695920c55733fd3efc4d9a8c7d7dadebc82f
Kim Low [Fri, 25 May 2018 13:22:33 +0000 (06:22 -0700)]
Merge changes from topic "ds4-support" am:
4fa06fe06d am:
25447adb6e
am:
1933884da7
Change-Id: I918bc5a031b02ff945f0ea7eb275f0f33700f21c
Sunny Kapdi [Fri, 25 May 2018 13:20:18 +0000 (06:20 -0700)]
A2DP Offload: Don't crash on repeated endSession am:
7a2110d666 am:
bb8d5e287c
am:
d256014557
Change-Id: I28e009f02060218343adcc22dc4e1ed224c3b2c8
Subramanian Srinivasan [Fri, 25 May 2018 13:19:23 +0000 (06:19 -0700)]
Merge "GATT: Fix GATT error response for execute write" am:
89f92dbdc4 am:
cfe66c38bc
am:
7e9a3dae8f
Change-Id: I22b35bfb636014fcd11d9bbcb346af93e8e7610c
Stanley Tng [Fri, 25 May 2018 13:15:46 +0000 (06:15 -0700)]
Merge "Increase LE connection interval with bonded Hearing Aids" am:
7dea19a6cc am:
b39f829886
am:
44a7e50dfa
Change-Id: I55adfcb739702912e2e8f3bdc85569bc851b46d1
Ajay Panicker [Fri, 25 May 2018 13:13:42 +0000 (06:13 -0700)]
Merge "[automerger skipped] Merge "Enable the AVRCP Service by default (2/2)" am:
1a4403bdc8 am:
18b8ad39a9 -s ours" into pi-dev-plus-aosp
am:
862efb7021 -s ours
Change-Id: I26e732c544601826b104e921ffbe9b98454b77af
Ajay Panicker [Fri, 25 May 2018 13:04:41 +0000 (06:04 -0700)]
[automerger skipped] Merge "Enable the AVRCP Service by default (2/2)" am:
1a4403bdc8 am:
18b8ad39a9 -s ours
am:
c165558f50 -s ours
Change-Id: I6423af4276f923a48d7d446636d9f3e7bfd1e493
Ajay Panicker [Fri, 25 May 2018 13:03:31 +0000 (06:03 -0700)]
Merge "AVRCP: Narrow the scope of the lock in Init and Cleanup" into pi-dev am:
a5e59584df
am:
3dc8d2b8c9
Change-Id: I594e9e4935dae163282ffb5d0394b853ce99d7fc
Jakub Pawlowski [Fri, 25 May 2018 13:03:13 +0000 (06:03 -0700)]
Add PDU size checks in process_service_search_attr_rsp am:
49399b5243
am:
9f4cc911e3
Change-Id: I027172664afb835583bc7f513422fd9af8a712b1
Stanley Tng [Fri, 25 May 2018 13:02:58 +0000 (06:02 -0700)]
Merge "Increase LE connection interval with bonded Hearing Aids" into pi-dev am:
daa0656702
am:
d7bd241c5d
Change-Id: I0be136db8e2b457e292209fdf46526cfa809dd77
Jakub Pawlowski [Fri, 25 May 2018 13:02:40 +0000 (06:02 -0700)]
Merge "GATT: Handle too short Error Response PDU" into pi-dev am:
ccf208e4fc
am:
22c850373e
Change-Id: Ib168129d2f5bb0b85752c7e61306d10bd65273d5
Jack He [Fri, 25 May 2018 13:02:21 +0000 (06:02 -0700)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange" into pi-dev am:
b90857655b
am:
758c9a315e
Change-Id: I382761cd7e38951044c2cb30d2b5209c56969ee5
Andre Eisenbach [Fri, 25 May 2018 13:02:03 +0000 (06:02 -0700)]
Merge "AVRCP: Cancel all pending messages and prevent future messages after cleanup" into pi-dev am:
389fdbdab4
am:
73fef811a9
Change-Id: I40fcb9f50d82bfcd73a35e50418170f71edd6afe
Jack He [Fri, 25 May 2018 13:01:44 +0000 (06:01 -0700)]
Merge "HFP: Ignore DISCONNECTED state in PhoneStateChange" am:
78eed90d9a am:
f48b7b15d8
am:
28641a9e7c
Change-Id: I54d77069909c2b5f6b3c403f5afe5a580754f39d
OSDN Git Service
