OSDN Git Service
Venkata Jagadeesh [Wed, 1 Aug 2018 18:58:45 +0000 (11:58 -0700)]
Merge "Add security handling for LE connection oriented channels" am:
fc53a1fcba
am:
c348d45dd2
Change-Id: Id1c17e86b21ba68c0cf1d8b019ad1dbece4b79b3
Venkata Jagadeesh [Wed, 1 Aug 2018 18:53:41 +0000 (11:53 -0700)]
Merge "Add security handling for LE connection oriented channels"
am:
fc53a1fcba
Change-Id: Ibba4bdb0f337d743a7148d49a1ad23eb2f8a8b5e
Treehugger Robot [Wed, 1 Aug 2018 18:38:10 +0000 (18:38 +0000)]
Merge "Add security handling for LE connection oriented channels"
Aiswarya Cyriac [Tue, 31 Jul 2018 23:36:02 +0000 (16:36 -0700)]
Fix for Bluetooth device name is resetting to default name after reboot am:
f589e45a3c
am:
0391cb76a8
Change-Id: I6c46801a5595db8bb5a5786ce1d70a2bbbea4289
Aiswarya Cyriac [Tue, 31 Jul 2018 23:32:00 +0000 (16:32 -0700)]
Fix for Bluetooth device name is resetting to default name after reboot
am:
f589e45a3c
Change-Id: I313af6b96913b72fc140c7873c1952f24b75c12a
Venkata Jagadeesh [Fri, 18 Mar 2016 06:34:30 +0000 (12:04 +0530)]
Add security handling for LE connection oriented channels
Use case:
Run PTS test cases TP/LE/CFC/BV-10-C to BV-16-C
Steps:
1. These test cases executed with two DUT as PTS support not available
2. Set desired security level on DUT and Remote with tool
3. Initiate LE COC connection request from DUT
Failure:
LE COC connection accepted though even remote security are not met.
Fix:
Added security handling for COC connection
Test: Ran sl4a test for BleCocTest
Change-Id: I5f6385d462698582e701b5a07953c0ccb932bbbf
Aiswarya Cyriac [Mon, 23 Jul 2018 09:47:48 +0000 (15:17 +0530)]
Fix for Bluetooth device name is resetting to default name after reboot
Reason: When the BT device name is updated is getting saved to the
config data pointer but not to the persistent data (i.e. bt_config.conf).
So, when the reboot is happening it is not able to get the updated device
name from the persistent data (i.e. bt_config.conf) as during reboot
bt_config_flush is not called.
Fix: Saving the BT Device name to persistent data using btif_config_flush
once it is set.
Test: Manual Reboot test
Bug:
110301897
Change-Id: Ie329b475eaaf208ed667f27e271a00e230e4b95c
Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
Signed-off-by: Gaganpreet kaur <gaganpreetx.kaur@intel.com>
Joseph Pirozzo [Mon, 30 Jul 2018 20:55:36 +0000 (13:55 -0700)]
Merge "Set Browsed Player memory allocation" am:
0b610a13c2
am:
f00f987890
Change-Id: Ic47aa119fc8a55459d50e95dce1f53e4cf03cc3d
Joseph Pirozzo [Mon, 30 Jul 2018 20:42:22 +0000 (13:42 -0700)]
Merge "Set Browsed Player memory allocation"
am:
0b610a13c2
Change-Id: I7e432dd8dcc8e389807998e2f07d368414412dd1
Joseph Pirozzo [Mon, 30 Jul 2018 20:31:00 +0000 (20:31 +0000)]
Merge "Set Browsed Player memory allocation"
Pavlin Radoslavov [Fri, 27 Jul 2018 23:58:33 +0000 (16:58 -0700)]
Add additional checks for AVDTP Codec Capabilities am:
3c5cef21d3
am:
2e50343f83
Change-Id: I18a233197d918a7f14a6d2cc34e5ebe9633f2266
Pavlin Radoslavov [Fri, 27 Jul 2018 23:54:27 +0000 (16:54 -0700)]
Add additional checks for AVDTP Codec Capabilities
am:
3c5cef21d3
Change-Id: If9ab310626b5acb2364a2403ba831de3021b5ce2
Joseph Pirozzo [Fri, 27 Jul 2018 18:08:17 +0000 (11:08 -0700)]
Set Browsed Player memory allocation
When setting a browsed player memory for folder depth was incorrectly
allocated based on folder item count not depth.
Bug:
111370532
Test: Set a browsed player that has a depth greater than item count.
Change-Id: I6984c5852f623e7e9478429bdab3dcbcf57196e0
Pavlin Radoslavov [Thu, 26 Jul 2018 02:03:09 +0000 (19:03 -0700)]
Add additional checks for AVDTP Codec Capabilities
Reject AVDTP Codec Capabilities that contain invalid fields
Bug:
110918549
Test: Manual - connect to a device that sends invalid codec capability
Change-Id: Ib697cc9ad13ed666fbafa9219447592fe3f56684
Bailey Forrest [Wed, 25 Jul 2018 00:58:21 +0000 (17:58 -0700)]
Merge "Swap order of registered/status in RegisterForNotificationCallback" am:
95d0798e7f
am:
7df7076194
Change-Id: I16e3e89c8935d1da5ffc470b3d7e686bd05d8dc5
Bailey Forrest [Wed, 25 Jul 2018 00:55:15 +0000 (17:55 -0700)]
Merge "Swap order of registered/status in RegisterForNotificationCallback"
am:
95d0798e7f
Change-Id: Ibe4f75b8eb8b50dd9aaa105bdbafe766bedb8ed4
Treehugger Robot [Wed, 25 Jul 2018 00:45:53 +0000 (00:45 +0000)]
Merge "Swap order of registered/status in RegisterForNotificationCallback"
Joseph Pirozzo [Wed, 25 Jul 2018 00:44:24 +0000 (17:44 -0700)]
Merge "Enable 2-EV3 packets for Wide Band HFP client" am:
503067b5f8
am:
f041e2ada5
Change-Id: I1c323cc063239a010a8b37478b901e486437d18d
Subramanian Srinivasan [Wed, 25 Jul 2018 00:43:51 +0000 (17:43 -0700)]
Merge "Use appropriate Tx time in BLE Set Data length command" am:
135c7bc70c
am:
125c1d8bb9
Change-Id: If16acac34d6500c7f45900e261b6247f423e41d5
Joseph Pirozzo [Wed, 25 Jul 2018 00:40:58 +0000 (17:40 -0700)]
Merge "Enable 2-EV3 packets for Wide Band HFP client"
am:
503067b5f8
Change-Id: Ib1e98cd9888ec9e5ff2da8a8114a6c24d4813cfc
Subramanian Srinivasan [Wed, 25 Jul 2018 00:40:34 +0000 (17:40 -0700)]
Merge "Use appropriate Tx time in BLE Set Data length command"
am:
135c7bc70c
Change-Id: Iafa186226b9ca38f71958de68055fe594bfac557
Joseph Pirozzo [Wed, 25 Jul 2018 00:38:12 +0000 (00:38 +0000)]
Merge "Enable 2-EV3 packets for Wide Band HFP client"
Treehugger Robot [Wed, 25 Jul 2018 00:33:00 +0000 (00:33 +0000)]
Merge "Use appropriate Tx time in BLE Set Data length command"
Fen Wang [Wed, 25 Jul 2018 00:22:28 +0000 (17:22 -0700)]
Make PROPERTY_PRODUCT_MODEL device configurable am:
19e728b9d2
am:
367508d227
Change-Id: I4d3fc8df174c0cd508b305225fb0d41412582df6
Fen Wang [Wed, 25 Jul 2018 00:12:23 +0000 (17:12 -0700)]
Make PROPERTY_PRODUCT_MODEL device configurable
am:
19e728b9d2
Change-Id: I5f25b8a07749e3c3eb7fed3fd4415fac3490c7b5
Bailey Forrest [Wed, 1 Mar 2017 19:27:05 +0000 (11:27 -0800)]
Swap order of registered/status in RegisterForNotificationCallback
It's confusing how the order is inconsistent with the one defined in
hardware/libhardware/include/hardware/bt_gatt_client.h
Test: Build. Right now no code uses these functions.
Change-Id: I04b93ba74555455fd981a3809ea3e0bfffca4696
Subramanian Srinivasan [Thu, 15 Mar 2018 22:58:20 +0000 (15:58 -0700)]
Use appropriate Tx time in BLE Set Data length command
Fixes Tx time parameter in HCI LE set data length command
depending on HCI versions supported by controller.
Bug:
110373079
Change-Id: I83cc4c41ca4c2b6470ec30057717946b1d7fe329
Fen Wang [Tue, 10 Apr 2018 03:41:34 +0000 (12:41 +0900)]
Make PROPERTY_PRODUCT_MODEL device configurable
Make it possible to set PROPERTY_PRODUCT_MODEL in device configuration.
Bug:
Change-Id: I4d34d4ec368f7eb8bd50e2d5431bb120a284f4e3
Cheney Ni [Tue, 24 Jul 2018 04:35:35 +0000 (21:35 -0700)]
Merge "Ignore SDP failure while bonding if SDP was not attempted" am:
62fee1a223
am:
2679201348
Change-Id: Ia6aaf670dc356c33cbb045138fcba8a3d3219872
Cheney Ni [Tue, 24 Jul 2018 04:31:32 +0000 (21:31 -0700)]
Merge "Ignore SDP failure while bonding if SDP was not attempted"
am:
62fee1a223
Change-Id: Iae385d9feca203640c00ab93a8199d3dc3f85fa1
Treehugger Robot [Tue, 24 Jul 2018 04:21:40 +0000 (04:21 +0000)]
Merge "Ignore SDP failure while bonding if SDP was not attempted"
Hansong Zhang [Fri, 20 Jul 2018 18:46:08 +0000 (11:46 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d am:
a9fc38bcbf am:
a7d532c77c
am:
91ff5fdae5
Change-Id: I0916ab399b4f2d7bae1b4dc5c4a505d982ea63c4
Hansong Zhang [Fri, 20 Jul 2018 18:45:00 +0000 (11:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4 am:
37e8dd3c55 am:
024d0e1d5b -s ours
am:
58351acf5b
Change-Id: Ia520ddcd0340519e982278e13f6461dcedda673e
Hansong Zhang [Fri, 20 Jul 2018 18:39:40 +0000 (11:39 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d am:
a9fc38bcbf
am:
a7d532c77c
Change-Id: Ic3bbfdf73d39b1455f6d27bf9294fb56011d0829
Hansong Zhang [Fri, 20 Jul 2018 18:39:07 +0000 (11:39 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4 am:
37e8dd3c55
am:
024d0e1d5b -s ours
Change-Id: Idb00a9bfd6c501c90ce4aa4361a586f9cf422f0d
Hansong Zhang [Fri, 20 Jul 2018 18:32:52 +0000 (11:32 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d
am:
a9fc38bcbf
Change-Id: I70a95eb32638425b21e5bef29a0a02b370277bac
Hansong Zhang [Fri, 20 Jul 2018 18:32:21 +0000 (11:32 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4
am:
37e8dd3c55
Change-Id: I94485d850eee68f7434b3f8f20332c243ceae2a1
Hansong Zhang [Fri, 20 Jul 2018 18:30:04 +0000 (11:30 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
am:
0d4898a05d
Change-Id: Id277c1b6c5b105a492d03980d5cf7e958128b505
Hansong Zhang [Fri, 20 Jul 2018 18:29:19 +0000 (11:29 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
am:
c898c9c6a4
Change-Id: If8c3042504c65bb244b253f822409457fadb096e
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:45 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
Change-Id: Ia2aafdffd87d9f7a00429d50783e64864fe92db3
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:44 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
Change-Id: I036429bc438f3713148c44668c9030d9968bbb71
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:43 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
Change-Id: I2b54ca809d16ca1df0a9061301f76cf64c16243e
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:41 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
Change-Id: I792c9737e3ba5ac8ab173e7675ddde50383a97b8
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:40 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
Change-Id: Ic935bcfa40526b5f6dbd8714552b6420a35cf29a
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:24 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
Change-Id: I4f5e848e72f9ae77371c2d4e596a882581d8fe7b
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:23 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8
Change-Id: I8705f0d81fba1027c7a9b506f447482901227c40
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:22 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e
Change-Id: I53e95354ae4b588f11e57fc6e5aef741177becfe
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:20 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4
Change-Id: I0693e632de44e6781f7435a730dcd485e27e4cab
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:19 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a
Change-Id: I54d6a6295dcb5791aa339ffaa23ac2f319acd667
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:18 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233
Change-Id: I5429442640a203df07ba448e8b9837fb8017eb6d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:17 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23
Change-Id: Ie9d7f0209ad248035cb65c9e6d04236ba61a9264
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:15 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb
Change-Id: Iea2346e652fe6bb086e894615bb409491d60457d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:14 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e
Change-Id: I1adfd8dd7cd684e5d9af4a1967f0630e53fe035f
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
Xin Li [Fri, 20 Jul 2018 06:48:42 +0000 (23:48 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am:
5c8ebba798
Change-Id: I85a0f9338f373c74bfd08108f3a113488a29ea93
Xin Li [Thu, 19 Jul 2018 20:50:38 +0000 (13:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug:
111615259
Change-Id: I380b09793ed30e2577f8ea2783ce2cc46b859278
Hansong Zhang [Wed, 18 Jul 2018 22:36:43 +0000 (15:36 -0700)]
Clean up style in BLE White List code am:
efb54f7d37
am:
879f7060d2
Change-Id: Iaa3e020f7b053b59fb53d92326ca800cd5fdf922
Hansong Zhang [Wed, 18 Jul 2018 22:34:06 +0000 (15:34 -0700)]
Clean up style in BLE White List code
am:
efb54f7d37
Change-Id: Ia4cee8a5437c430dc75fbf16db9cc381ed4f2e1c
Benson Li [Wed, 18 Jul 2018 19:07:18 +0000 (12:07 -0700)]
[automerger skipped] Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
am:
3ff7033b27 -s ours
Change-Id: I5303a47ddb949dd84d9f6b19d89e924401f3f063
TreeHugger Robot [Wed, 18 Jul 2018 18:58:15 +0000 (18:58 +0000)]
Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
Hansong Zhang [Tue, 17 Jul 2018 00:57:17 +0000 (17:57 -0700)]
Clean up style in BLE White List code
* Remove unused code
* Update BgConnHash to return size_t for hashcode
* Change BLE scan_int and scan_win to uint16_t according to spec
Bug:
111562702
Test: SL4A BLE test and manual with BLE mouse
Change-Id: Ieff3acbfaa95b7d804e57021d562218d9fbe42cc
Cheney Ni [Tue, 17 Jul 2018 11:27:59 +0000 (19:27 +0800)]
Ignore SDP failure while bonding if SDP was not attempted
When bonding, there is an ACL_UP event to the upper layers and some apps
may want to fetch SDP in return. This can break pairing. In cases SDP fails,
it causes the procedure to be finished before the LinkKey is generated.
And thus the LinkKey is not committed to NVRAM and the device is not paired.
Bug:
111189110
Test: : Pair / Unpair BT accessories manually
Change-Id: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8
Jack He [Wed, 18 Jul 2018 00:05:21 +0000 (17:05 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format" am:
85cce9b01f
am:
ca55025537
Change-Id: I025ffdc3ea9e6ffd2d2f3b110f87fe3291dda036
Jack He [Tue, 17 Jul 2018 23:59:50 +0000 (16:59 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
am:
85cce9b01f
Change-Id: Ib882d2a6fc9d430cb7d0bf55e0e7c551b7b2d05a
Treehugger Robot [Tue, 17 Jul 2018 23:50:34 +0000 (23:50 +0000)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
Jack He [Fri, 13 Jul 2018 21:54:38 +0000 (14:54 -0700)]
Metrics: Add python script to dump metrics into ASCII format
Test: make,
./dump_metrics_ascii.py proto/bluetooth/metrics/bluetooth.proto
Change-Id: Ie671fa2c2ceb9f93ed62495b592a2cf9d69ff41b
Ben YoungTae Kim [Tue, 17 Jul 2018 03:52:12 +0000 (20:52 -0700)]
Increase DM connection size for multiple links am:
d12993c4f6
am:
a6790ee15f
Change-Id: I0638becb9228a0e4ffffbcc3a411253edf13a521
Ben YoungTae Kim [Tue, 17 Jul 2018 03:49:06 +0000 (20:49 -0700)]
Increase DM connection size for multiple links
am:
d12993c4f6
Change-Id: I0a0d4cc4a0e8f32d3b3407c370389260f864a3e7
Ben YoungTae Kim [Tue, 10 Jul 2018 00:58:12 +0000 (17:58 -0700)]
Increase DM connection size for multiple links
For multiple headset connections, it will be increased to support
multiple services(HFP/AV/CT) for each links.
Test: Connect to 4 or more headsets and play music
Bug:
110972513
Change-Id: I56f69e12fb1a4a614c69fa383e9c53675a189fc9
Hansong Zhang [Sat, 14 Jul 2018 00:36:54 +0000 (17:36 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37 am:
a7992011a4 am:
4a8e14e16b
am:
e84112ce6a
Change-Id: I79f1180ef4b7a4751d74f2cbb3573e540cdd134b
Hansong Zhang [Sat, 14 Jul 2018 00:36:24 +0000 (17:36 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e am:
aa7175ae97 am:
05211b1947 -s ours
am:
3bd185c062
Change-Id: I33237b85346d7f18586959942a22a01fc534830c
Hansong Zhang [Sat, 14 Jul 2018 00:35:47 +0000 (17:35 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours am:
85a799bff2 -s ours am:
af35291d41 -s ours
am:
3d564ba040 -s ours
Change-Id: I8382303d87f22a3a3c6d567e8e849e6e31818761
Hansong Zhang [Sat, 14 Jul 2018 00:20:24 +0000 (17:20 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37 am:
a7992011a4
am:
4a8e14e16b
Change-Id: Iab5a146f0f22780a38192c1e5294350738daf0a7
Hansong Zhang [Sat, 14 Jul 2018 00:19:59 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e am:
aa7175ae97
am:
05211b1947 -s ours
Change-Id: If80c66ab182419dbe22d455dd332ec20c3670da9
Hansong Zhang [Sat, 14 Jul 2018 00:19:47 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours am:
85a799bff2 -s ours
am:
af35291d41 -s ours
Change-Id: I01cde7e51e2ebf2482746aa19f23ba3d925923ef
Hansong Zhang [Sat, 14 Jul 2018 00:07:40 +0000 (17:07 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37
am:
a7992011a4
Change-Id: I2dbe619f4db2afd28f1426265e2e43c5ede9efd3
Hansong Zhang [Sat, 14 Jul 2018 00:07:13 +0000 (17:07 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e
am:
aa7175ae97
Change-Id: Ic9876c6ff2c1919976e2409970f02f61f4c4db20
Hansong Zhang [Sat, 14 Jul 2018 00:06:42 +0000 (17:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours
am:
85a799bff2 -s ours
Change-Id: I5cf4f65085bc701e75af5556d0315e2923b8f1ea
Hansong Zhang [Fri, 13 Jul 2018 23:12:06 +0000 (16:12 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
am:
e6d78b9c37
Change-Id: Id4bc567e478860b199e7cbea2c91fc163b0cc01f
TreeHugger Robot [Fri, 13 Jul 2018 23:00:24 +0000 (23:00 +0000)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
Hansong Zhang [Fri, 13 Jul 2018 22:31:26 +0000 (15:31 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
am:
93110a553e
Change-Id: I6e00c18146c048be020c8077b9b3ba7a8aabe2a0
Hansong Zhang [Fri, 13 Jul 2018 22:30:55 +0000 (15:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa
am:
d88cfe6530 -s ours
Change-Id: I2d99954f7ee5fd5f246eae2158a01fb4f4c679a6
Hansong Zhang [Fri, 13 Jul 2018 20:45:46 +0000 (13:45 -0700)]
Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:17 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
Change-Id: I26b9980c190e11ac0676e4ca3d24766614653d96
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:15 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf
Change-Id: I81864bd4e4a97b50a9e22ba426e336717463496f
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:13 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9
Change-Id: I7b018c136700d25e8a4905d0245d802979ea8c78
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:12 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53
Change-Id: I58c883eeac2c4a6db16ed70ba54cade1e548e549
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:10 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942
Change-Id: Ic4a9218144a8c88e8bc84177d0f85c976fae1844
Hansong Zhang [Fri, 13 Jul 2018 20:43:27 +0000 (13:43 -0700)]
DO NOT MERGE Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Benson Li [Fri, 13 Jul 2018 20:19:34 +0000 (13:19 -0700)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed" am:
44e0158c80
am:
86ef9a9496
Change-Id: I1fb4fe0452d51b188ff8d8e68957de5905d6b88a
Jack He [Fri, 13 Jul 2018 20:18:27 +0000 (13:18 -0700)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support" am:
ef3927a23e
am:
995c00da80
Change-Id: I7d1e4be7c8c4b9bd401a73cfeaf587d2f4767651
Benson Li [Fri, 13 Jul 2018 20:10:16 +0000 (13:10 -0700)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed"
am:
44e0158c80
Change-Id: I9f87fd712572e9495b5bceac2f7b96985c963a58
Jack He [Fri, 13 Jul 2018 20:09:18 +0000 (13:09 -0700)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support"
am:
ef3927a23e
Change-Id: Ic87f2bca46c7f3313e7ec9c838ba49fbac0441e5
Treehugger Robot [Fri, 13 Jul 2018 19:59:10 +0000 (19:59 +0000)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed"
Treehugger Robot [Fri, 13 Jul 2018 19:58:46 +0000 (19:58 +0000)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support"
Hansong Zhang [Fri, 13 Jul 2018 17:50:22 +0000 (10:50 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours am:
262a81d328 -s ours am:
8729bc8b2a -s ours
am:
b07d6f48b0 -s ours
Change-Id: I1c3e304f6df2004f2f9279a07ebe2c8c500f6e9e
Hansong Zhang [Fri, 13 Jul 2018 17:20:02 +0000 (10:20 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours am:
262a81d328 -s ours
am:
8729bc8b2a -s ours
Change-Id: If2af5bbcbf0036810c76d2f5920742c8965c38fa
Hansong Zhang [Fri, 13 Jul 2018 16:51:51 +0000 (09:51 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours
am:
262a81d328 -s ours
Change-Id: Ic909e32a9c23540ac149709e4686f9d705bae687
OSDN Git Service
