OSDN Git Service
Chris Manton [Wed, 8 Jan 2020 18:52:45 +0000 (10:52 -0800)]
Merge "Replace source files with static library"
am:
5025102343
Change-Id: I9c017433b7a0929879db3b8d59a509714323b99f
Chris Manton [Wed, 8 Jan 2020 18:52:21 +0000 (10:52 -0800)]
Merge "Remove 1:1 mandate for psm:channel"
am:
3c2b307600
Change-Id: I58cc94880211924b43cc52b519747be72e6a77e3
Treehugger Robot [Wed, 8 Jan 2020 18:50:56 +0000 (18:50 +0000)]
Merge "Replace source files with static library"
Treehugger Robot [Wed, 8 Jan 2020 18:49:36 +0000 (18:49 +0000)]
Merge "Remove 1:1 mandate for psm:channel"
Xin Li [Wed, 8 Jan 2020 17:47:18 +0000 (09:47 -0800)]
DO NOT MERGE - Merge January 2020 Security Release into master
am:
9ba8138dcb
Change-Id: Ia8b22c13b34d0d80aa942b39f722db7af559f2ac
Chris Manton [Wed, 8 Jan 2020 05:12:40 +0000 (21:12 -0800)]
Remove 1:1 mandate for psm:channel
PSMs may have multiple channels open.
Bug:
147316415
Test: Run 2 concurrent SDP queries
Change-Id: I9a87d24a21889f39b377297ae0c33ae8f1c6bed2
Xin Li [Tue, 7 Jan 2020 23:25:25 +0000 (15:25 -0800)]
DO NOT MERGE - Merge January 2020 Security Release into master
Bug:
147314974
Change-Id: I0feed5aa585da1bb404f6c5f6abdab29a5711ba6
Chris Manton [Tue, 7 Jan 2020 22:05:36 +0000 (14:05 -0800)]
Replace source files with static library
Bug:
147316415
Test: Passes presubmit tests
Change-Id: I1a318a476f80f3cc372d30274ab86971418a9793
Rahul Sabnis [Tue, 7 Jan 2020 20:56:31 +0000 (12:56 -0800)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"
am:
c999e08380
Change-Id: I69e776c58e33124e36b022370a9c82277c8760f7
Treehugger Robot [Tue, 7 Jan 2020 20:33:21 +0000 (20:33 +0000)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"
Myles Watson [Tue, 7 Jan 2020 20:21:54 +0000 (12:21 -0800)]
Merge "HCI: Add LE Scanning Manager test"
am:
d12ccf83b6
Change-Id: I3cf20dfc3152fd8058c23ae7409bc7ed36100194
Treehugger Robot [Tue, 7 Jan 2020 19:05:59 +0000 (19:05 +0000)]
Merge "HCI: Add LE Scanning Manager test"
Myles Watson [Tue, 7 Jan 2020 17:59:08 +0000 (09:59 -0800)]
Only include common.proto when used
am:
6e648ddd5f
Change-Id: I4ab7f755604d99fdd66bf3cedc9344c167ee61f0
Myles Watson [Mon, 6 Jan 2020 23:00:53 +0000 (15:00 -0800)]
Only include common.proto when used
Test: ./cert/run_cert_facade_only.sh
Change-Id: I11aed3d8ccb021990ada1e60ec82bb294e7fb72c
Jakub Pawlowski [Tue, 7 Jan 2020 16:09:57 +0000 (08:09 -0800)]
Merge BTM_SecBond and BTM_SecBondByTransport
am:
948aeebcbf
Change-Id: I7c960c939944d06dc74391862438954ab157aea9
Jakub Pawlowski [Tue, 7 Jan 2020 12:47:55 +0000 (13:47 +0100)]
Merge BTM_SecBond and BTM_SecBondByTransport
This makes the API surface smaller, and code paths easier to follow.
Bug:
147086339
Change-Id: Ia24771d73792bd352678d41550608f805f27062c
Chris Manton [Tue, 7 Jan 2020 01:42:40 +0000 (17:42 -0800)]
Merge "Add explicit legacy module path"
am:
87f65e1899
Change-Id: Iccbe33a95891b09bd232942e8c98f9a124d9cad9
Chris Manton [Tue, 7 Jan 2020 01:42:14 +0000 (17:42 -0800)]
Add runtime sanity checks
am:
1e40652f53
Change-Id: I9fd43669310aab366d599e149dded2fcf35a0a5f
Treehugger Robot [Tue, 7 Jan 2020 01:37:05 +0000 (01:37 +0000)]
Merge "Add explicit legacy module path"
Myles Watson [Mon, 6 Jan 2020 22:44:11 +0000 (14:44 -0800)]
HCI: Add LE Scanning Manager test
Bug:
143569719
Test: ./cert/run_cert_facade_only.sh
Change-Id: I7d7c9837f4af765b0fa1680bc90903df54e6ad83
Chris Manton [Mon, 6 Jan 2020 23:20:21 +0000 (15:20 -0800)]
Add explicit legacy module path
The module.h file is ambiguous without an explicit
path for legacy or gd include.
Bug:
146086425
Test: Builds and enables on crosshatch
Change-Id: I1b25ba4ffcd0a9177181d4ce2bb47bc06a930d9d
Chris Manton [Mon, 6 Jan 2020 23:17:17 +0000 (15:17 -0800)]
Add runtime sanity checks
Bug:
146086425
Test: Manually boots
Change-Id: I17e10a2c7fa9646b2a727da726ed3757d42439e3
Rahul Sabnis [Mon, 6 Jan 2020 23:20:12 +0000 (15:20 -0800)]
Add setConnectionPolicy to IBluetoothPbap.aidl
Bug:
145943634
Test: Manual
Change-Id: Idfae61d09c5338ee3de362aeb3a2bbae68818eb4
Myles Watson [Mon, 6 Jan 2020 22:59:24 +0000 (14:59 -0800)]
Merge "Implement Classic scanning facade"
am:
10c45fdcc1
Change-Id: I5382e0c78623664d956beb1e91137238f215642e
Treehugger Robot [Mon, 6 Jan 2020 22:54:07 +0000 (22:54 +0000)]
Merge "Implement Classic scanning facade"
Chris Manton [Mon, 6 Jan 2020 21:19:36 +0000 (13:19 -0800)]
Merge "Synchronize l2cap channel for client apps"
am:
e5af90bce5
Change-Id: I760e8dbba7c26461c17810b6df16b4a473c2a287
Jakub Pawlowski [Mon, 6 Jan 2020 21:11:12 +0000 (13:11 -0800)]
Merge "Add shim for Security CreateBond method"
am:
cb5a724f66
Change-Id: I9d096870e11f82b5cc97ba288cfb3ed7f05d83c2
Myles Watson [Mon, 6 Jan 2020 21:10:48 +0000 (13:10 -0800)]
Merge "HCI: Start facade directory for testing"
am:
964751442e
Change-Id: I557fee12a4ae696079950af8dfeac1af51dad6aa
Andre Eisenbach [Mon, 6 Jan 2020 21:08:22 +0000 (13:08 -0800)]
Merge "Uncomment HID cache logic"
am:
d86f23d170
Change-Id: Ief49cf41829642be24bd72bffe5c5bf6bb0d437b
Treehugger Robot [Mon, 6 Jan 2020 20:45:06 +0000 (20:45 +0000)]
Merge "Synchronize l2cap channel for client apps"
Jakub Pawlowski [Mon, 6 Jan 2020 20:11:49 +0000 (20:11 +0000)]
Merge "Add shim for Security CreateBond method"
Treehugger Robot [Mon, 6 Jan 2020 19:40:35 +0000 (19:40 +0000)]
Merge "HCI: Start facade directory for testing"
Andre Eisenbach [Mon, 6 Jan 2020 19:34:37 +0000 (19:34 +0000)]
Merge "Uncomment HID cache logic"
Chris Manton [Thu, 19 Dec 2019 00:58:58 +0000 (16:58 -0800)]
Synchronize l2cap channel for client apps
Respond immediately with a connection interface
descriptor rather than wait for the actual
connection in order to avoid a race.
Bug:
146565627
Test: CtsVerifier insecure connections
Change-Id: Ie6eeda50a01ee7fda076330d5583b9793578b1bb
Myles Watson [Fri, 3 Jan 2020 23:20:33 +0000 (15:20 -0800)]
Implement Classic scanning facade
Bug:
143568835
Test: Neighbor module tests
Change-Id: Ibb479bceba349bd1fc230fb3d95f16a86d098ff4
Myles Watson [Wed, 18 Dec 2019 23:47:38 +0000 (15:47 -0800)]
HCI: Start facade directory for testing
Create new tests that depend on the HciLayer. Other interfaces
deserve their own facades.
Bug:
143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: Ia6bf16a42450a457c5d7ea3430a6d300f113a2b8
Jakub Pawlowski [Thu, 2 Jan 2020 14:01:16 +0000 (15:01 +0100)]
Add shim for Security CreateBond method
This allow for manual testing of GD implementation with real devices
Bug:
147086339
Change-Id: I196f71f15b828f89a221bca1658136593a31e561
Myles Watson [Sat, 4 Jan 2020 03:05:14 +0000 (19:05 -0800)]
Merge "CERT: Wait for second event in assert_event_occurs"
am:
a3002c1a4d
Change-Id: I74a74aa12fff00be17b479fc4f8525380c26f5e4
Treehugger Robot [Sat, 4 Jan 2020 02:42:31 +0000 (02:42 +0000)]
Merge "CERT: Wait for second event in assert_event_occurs"
Myles Watson [Sat, 4 Jan 2020 02:05:42 +0000 (18:05 -0800)]
Merge "L2CAP facade depends on HciLayer"
am:
71d74584d6
Change-Id: I7fcff09bcb5bb6496456146485c159c6521ebee3
Myles Watson [Sat, 4 Jan 2020 02:05:15 +0000 (18:05 -0800)]
RootCanal: Implement Read Inquiry and Page params
am:
b9e37feeee
Change-Id: Ib2a61b4ef494d2fbee6bfffa35cf2965c71e4af2
Treehugger Robot [Sat, 4 Jan 2020 01:57:40 +0000 (01:57 +0000)]
Merge "L2CAP facade depends on HciLayer"
Myles Watson [Sat, 4 Jan 2020 00:32:27 +0000 (16:32 -0800)]
CERT: Wait for second event in assert_event_occurs
Test: ./cert/run_cert_facade_only.sh
Change-Id: Icf6388116c7e7aad138678198bec32b8847200bf
Myles Watson [Mon, 23 Dec 2019 22:33:34 +0000 (14:33 -0800)]
L2CAP facade depends on HciLayer
Bug:
143568835
Test: ./cert/run_cert.sh
Change-Id: I0dec5b327ac6bf4adb66c760c3a98166de428737
Myles Watson [Fri, 3 Jan 2020 23:34:46 +0000 (15:34 -0800)]
RootCanal: Implement Read Inquiry and Page params
Bug:
143568835
Test: start neighbor module with RootCanal
Change-Id: I1c6790119249234b4e41d5c136cfd7d737608543
TreeHugger Robot [Fri, 3 Jan 2020 17:50:03 +0000 (17:50 +0000)]
Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master
Myles Watson [Thu, 2 Jan 2020 22:47:50 +0000 (14:47 -0800)]
Merge "Cert: Add tests for event_asserts"
am:
4edca2dbae
Change-Id: I8d49f3ac231f746f9d9e675d6e9766cefdc1086b
Treehugger Robot [Thu, 2 Jan 2020 22:12:40 +0000 (22:12 +0000)]
Merge "Cert: Add tests for event_asserts"
Xin Li [Thu, 2 Jan 2020 21:29:53 +0000 (13:29 -0800)]
DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Change-Id: I8e975eb4b719bbc3836b2ff58c80105b17ee5200
Rahul Sabnis [Thu, 2 Jan 2020 21:01:49 +0000 (13:01 -0800)]
Merge "Remove unused BluetoothHearingAid methods from aidl"
am:
e9177eb314
Change-Id: Ia0488b2facbd9e0db52d7f046237f4c946fb317e
Treehugger Robot [Thu, 2 Jan 2020 20:43:57 +0000 (20:43 +0000)]
Merge "Remove unused BluetoothHearingAid methods from aidl"
Hansong Zhang [Thu, 2 Jan 2020 19:43:01 +0000 (11:43 -0800)]
Merge "BTM: Remove dead code"
am:
2ee4021bd4
Change-Id: I8621b6e9ed4ebf88709785839e4a467c74116f4b
Treehugger Robot [Thu, 2 Jan 2020 19:40:46 +0000 (19:40 +0000)]
Merge "BTM: Remove dead code"
Colin Cross [Thu, 2 Jan 2020 19:19:44 +0000 (11:19 -0800)]
Merge "Use LoadHookContext instead of the deprecated BaseContext"
am:
b67e9ec679
Change-Id: Iac099445675812c4b706f9fb2827c4848e54c1ff
Treehugger Robot [Thu, 2 Jan 2020 19:11:35 +0000 (19:11 +0000)]
Merge "Use LoadHookContext instead of the deprecated BaseContext"
Cheney Ni [Thu, 2 Jan 2020 19:03:48 +0000 (11:03 -0800)]
Merge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"
am:
2785987caa
Change-Id: Icbfe1b062028285a99e7af3c9ad830ecbafd23f3
Cheney Ni [Thu, 2 Jan 2020 19:01:27 +0000 (11:01 -0800)]
Merge "A2DP: Clear local pending flags while AV is stable"
am:
36856c96cd
Change-Id: Idd0757605ff182e0e6cc7db64b616a683f5d2f45
Cheney Ni [Thu, 2 Jan 2020 19:00:50 +0000 (11:00 -0800)]
Merge "A2DP: Reply AVDT_StartReq failure to upper-layer"
am:
34d6a9c81d
Change-Id: I465f4a5b2e7f5bca2c748ae9d779910d5311c711
Treehugger Robot [Thu, 2 Jan 2020 18:58:34 +0000 (18:58 +0000)]
Merge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"
Treehugger Robot [Thu, 2 Jan 2020 18:50:41 +0000 (18:50 +0000)]
Merge "A2DP: Clear local pending flags while AV is stable"
Treehugger Robot [Thu, 2 Jan 2020 18:47:25 +0000 (18:47 +0000)]
Merge "A2DP: Reply AVDT_StartReq failure to upper-layer"
Myles Watson [Thu, 2 Jan 2020 18:01:27 +0000 (10:01 -0800)]
Cert: Add tests for event_asserts
Bug:
143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: I006efa1e276ac3ae839fd0305686de605b52044d
Cheney Ni [Thu, 2 Jan 2020 02:44:06 +0000 (10:44 +0800)]
A2DP: Clear local pending flags while AV is stable
There was a timing issue that the local pending state was cleared, AV
state was transitioning from started to opened, and was still saw as
started before entered the opened state. This caused a mismatched
between Bluetooth stack and audio HAL, and since we would clear those
local pending flags while entring opened state, it was redundant to
clear the state before the transition.
Bug:
140609685
Test: A2DP playback manually
Change-Id: Ie60bc9c432faa5038340f57da18282255ea5c7c4
Colin Cross [Mon, 30 Dec 2019 23:50:46 +0000 (15:50 -0800)]
Use LoadHookContext instead of the deprecated BaseContext
Test: m checkbuild
Change-Id: I21076e0f2070c5085e008af796c1851289e9192c
Hansong Zhang [Sat, 21 Dec 2019 00:24:38 +0000 (16:24 -0800)]
BTM: Remove dead code
Test: compile
Change-Id: I18b48347656a1b93ce8103fffde527a6f0e4e1d1
Cheney Ni [Mon, 30 Dec 2019 20:02:58 +0000 (12:02 -0800)]
Merge changes from topic "A2DP_HAL_SWHW_SWITCH"
am:
be7a88318f
Change-Id: I7eeae3fdcb2f875bf30160fb9ca9fb09e54c7f6f
Treehugger Robot [Mon, 30 Dec 2019 18:50:15 +0000 (18:50 +0000)]
Merge changes from topic "A2DP_HAL_SWHW_SWITCH"
* changes:
A2DP: Based on the HAL session type to control the encoder
A2DP: HALs switching between software and offloading sessions
Cheney Ni [Mon, 30 Dec 2019 06:45:10 +0000 (14:45 +0800)]
BluetoothAudioHAL: Supports the A2dpSuspended parameter
When establishing a SCO connection, HFP will use the A2dpSuspended
parameter to inform audio HALs for preventing A2DP playback and SCO
coexistence. Since some Bluetooth headset could not handle both A2DP
streaming and SCO at the same time but became abnormal, usually APPs who
was going to use SCO should first acquire the audio focus to pause the
A2DP playback, and then asked for SCO. Because some APPs did not do so,
we need this change to help preventing such IOPs.
Bug:
138698886
Bug:
144820778
Test: make A2DP and SCO connections manually
Change-Id: Id9a1ad08908b30055e02c12a671fc02537ac7100
Cheney Ni [Fri, 27 Dec 2019 17:04:17 +0000 (09:04 -0800)]
Merge "A2DP: Apply codec offloading preference for hybrid mode"
am:
bf1d6893e2
Change-Id: I8409653da304154f2701d1659dc836a42ccb0528
Treehugger Robot [Fri, 27 Dec 2019 16:38:03 +0000 (16:38 +0000)]
Merge "A2DP: Apply codec offloading preference for hybrid mode"
Cheney Ni [Fri, 1 Nov 2019 06:15:31 +0000 (14:15 +0800)]
A2DP: Reply AVDT_StartReq failure to upper-layer
Respond about AV started failure.
Bug:
135655859
Bug:
146826455
Test: fake an error to make sure the result is updated
Change-Id: I36289a63e928a3bd26c5f0c58a1e81e2816a959b
Cheney Ni [Fri, 27 Dec 2019 00:22:59 +0000 (16:22 -0800)]
Merge changes I49a602db,I4baff647
am:
af4a097b48
Change-Id: Ic449996e14bf8ccb014d44cc4535ef9f04705b50
Treehugger Robot [Fri, 27 Dec 2019 00:18:56 +0000 (00:18 +0000)]
Merge changes I49a602db,I4baff647
* changes:
A2DP: Disconnect AVDTP only when there is a link
A2DP: Clear the collision mask while disconnecting
Cheney Ni [Wed, 25 Dec 2019 07:39:22 +0000 (15:39 +0800)]
A2DP: Disconnect AVDTP only when there is a link
bta_av_cb.conn_lcb within AV control block is the index bitmask of all
used LCBs which is shared between all connected links, and is changed
when related AVDTP signal channel up or down. When disconnecting the
AVDTP link, we should only check its bitmask and ignore others.
Bug:
145326274
Bug:
146849922
Test: Connect with multiple A2DP sinks
Change-Id: I49a602dbcd76254d9b40eb7b19ffd16d3b45ba3d
Cheney Ni [Wed, 25 Dec 2019 07:39:22 +0000 (15:39 +0800)]
A2DP: Clear the collision mask while disconnecting
While remote is opening AVDTP channel, the stack setup a coll_mask
flags with a signalling timer, and takes over the control after timer
expired. This prevents the connection collision. However, if there were
two incoming connections at the same time, the timer was overridden by
the second connection, and this flags of the first connection kept
activated, but the following outgoing connection was blocked. In order
to prevent the worng flags, this change reset flags while disconnecting.
Bug:
146849922
Test: Connect with multiple A2DP sinks
Change-Id: I4baff647d22f1148bf6fa2b61e778652c9c90091
Ted Wang [Thu, 26 Dec 2019 07:27:11 +0000 (23:27 -0800)]
Merge "L2CAP respond configuration reqeust with options"
am:
a105e2a0e8
Change-Id: If65395761a07b00908bd18801713a502e1cf30b9
Treehugger Robot [Thu, 26 Dec 2019 07:24:26 +0000 (07:24 +0000)]
Merge "L2CAP respond configuration reqeust with options"
Myles Watson [Tue, 24 Dec 2019 00:01:28 +0000 (16:01 -0800)]
Cert: Remove exceptions from event_asserts
am:
6fc68d316e
Change-Id: I50f77d35cf096fecaba52ac4d64b7cb08534f17b
Myles Watson [Mon, 23 Dec 2019 21:33:21 +0000 (13:33 -0800)]
Cert: Remove exceptions from event_asserts
Use Python string formatting in assert_true.
Check for None before printing events.
Print the last event received.
Bug:
143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: I7df6250071e767da6a4f4d740b17c050ef3f8c1a
Myles Watson [Sat, 21 Dec 2019 03:09:02 +0000 (19:09 -0800)]
PDL Pybind: Allow packets to contain packets
am:
f80388c158
Change-Id: I034ac43f102163add560506cd2bd86f96bc7cfc7
Myles Watson [Sat, 21 Dec 2019 00:42:40 +0000 (16:42 -0800)]
PDL Pybind: Allow packets to contain packets
Bug:
143568835
Test: import bluetooth_packets_python3.hci_packets as hci_packets
conn_handle = 23
acl_packet = hci_packets.AclPacketBuilder(conn_handle,
hci_packets.PacketBoundaryFlag.FIRST_NON_AUTOMATICALLY_FLUSHABLE,
hci_packets.BroadcastFlag.POINT_TO_POINT, packet_to_send).Serialize()
acl_packet
# [23, 0, 3, 0, 20, 12, 0]
payload = hci_packets.ReadLocalNameBuilder()
payload.Serialize()
# [20, 12, 0]
conn_handle = 23
acl_packet = hci_packets.AclPacketBuilder(conn_handle,
hci_packets.PacketBoundaryFlag.FIRST_NON_AUTOMATICALLY_FLUSHABLE,
hci_packets.BroadcastFlag.POINT_TO_POINT, payload)
acl_packet.Serialize()
# [23, 0, 3, 0, 20, 12, 0]
Change-Id: I4d5109d0f8d5ea4af4e935db4cdaf558a93ea74b
Hansong Zhang [Fri, 20 Dec 2019 23:36:12 +0000 (15:36 -0800)]
RFCOMM: Remove dead code
am:
7b6ffce49e
Change-Id: I9769490ee094e65fa0835cd2bdee198a3b733286
Hansong Zhang [Fri, 20 Dec 2019 20:44:57 +0000 (12:44 -0800)]
RFCOMM: Remove dead code
Test: compile
Change-Id: I1a989515f57d68a3ea30ac0f86f7e1196cfcd2b9
Chris Manton [Fri, 20 Dec 2019 04:21:28 +0000 (20:21 -0800)]
Merge "Clear static btm checks during shutdown"
am:
cb767a6fce
Change-Id: I8a43e78fc5fc3c167d1dd0058d6e34d71de9d266
Treehugger Robot [Fri, 20 Dec 2019 04:17:51 +0000 (04:17 +0000)]
Merge "Clear static btm checks during shutdown"
Hansong Zhang [Fri, 20 Dec 2019 03:55:27 +0000 (19:55 -0800)]
Remove dead code in SDP
am:
c0f6c9474b
Change-Id: I61bbfd340e56acb30bb8d297cca78157ab53bad0
Chris Manton [Fri, 20 Dec 2019 02:43:08 +0000 (18:43 -0800)]
Clear static btm checks during shutdown
Bug:
140778599
Test: net_test_bluetooth
Change-Id: Ib2c42788c35e1486b316d205def7cc568c85e012
Hansong Zhang [Fri, 20 Dec 2019 01:27:16 +0000 (17:27 -0800)]
Remove dead code in SDP
Test: compile
Change-Id: Id57fb6d7f757f6656ab9b2d5c5b22a3dd4e6bd73
Ted Wang [Sat, 7 Dec 2019 10:53:48 +0000 (18:53 +0800)]
L2CAP respond configuration reqeust with options
Override retransmission timeout and monitor timeout with local timeout
if remote send 0
Bug:
145848834
Test: run_cert.sh test_respond_configuration_ertm
Change-Id: I0b68adce120c6a2334fadae305c482008b31d7b5
Hansong Zhang [Thu, 19 Dec 2019 01:27:49 +0000 (17:27 -0800)]
Merge "L2CAP: Integrate ERTM to shim"
am:
17eacc7198
Change-Id: Ied05dcb3c68cf996d4f489518f6fdc3e5abf392b
Treehugger Robot [Thu, 19 Dec 2019 01:18:20 +0000 (01:18 +0000)]
Merge "L2CAP: Integrate ERTM to shim"
Hansong Zhang [Tue, 17 Dec 2019 22:00:15 +0000 (14:00 -0800)]
L2CAP: Integrate ERTM to shim
Bug:
145847248
Test: bluetooth_test_legacy
Change-Id: I28e8881dc6a9dd12514711bab6e7d47e92f1b53f
Chris Manton [Wed, 18 Dec 2019 21:47:24 +0000 (13:47 -0800)]
Merge changes I4184f82e,If7223eaf
am:
a62128bc8d
Change-Id: Ibb1c66bc02833aad3ee2015753829f5bb80121b9
Treehugger Robot [Wed, 18 Dec 2019 21:38:39 +0000 (21:38 +0000)]
Merge changes I4184f82e,If7223eaf
* changes:
Connect shim timers
Add timer capability for shim stack
Chris Manton [Tue, 17 Dec 2019 17:38:32 +0000 (09:38 -0800)]
Connect shim timers
Bug:
143578947
Test: bluetooth_test_legacy
Change-Id: I4184f82e1ab1a9ceb44297882a564530a39dee70
Chris Manton [Mon, 16 Dec 2019 20:36:08 +0000 (12:36 -0800)]
Add timer capability for shim stack
The le advertising and scanning features
require timers to stop functionality after the
requested interval.
Bug:
146367779
Test: bluetooth_legacy_test
Change-Id: If7223eaff30785c661bca7f90d94462772d576bc
Cheney Ni [Wed, 18 Dec 2019 17:30:30 +0000 (09:30 -0800)]
Merge "A2DP: HAL codec offloading capabilities check preparation"
am:
250f2a29e1
Change-Id: I3e17d59e9e0c8d961eb5bbd371aadc7dfb3f5479
Treehugger Robot [Wed, 18 Dec 2019 17:27:58 +0000 (17:27 +0000)]
Merge "A2DP: HAL codec offloading capabilities check preparation"
Martin Brabham [Wed, 18 Dec 2019 17:02:35 +0000 (09:02 -0800)]
Merge changes from topic "gd_sm_cert"
am:
d9d2be500c
Change-Id: Idac175a9a1e6e0280e90f4184e2d99ec0b9f52c3
Treehugger Robot [Wed, 18 Dec 2019 16:40:25 +0000 (16:40 +0000)]
Merge changes from topic "gd_sm_cert"
* changes:
SecurityModule: Setup devices
SecurityModule: Add security module to gd_device