OSDN Git Service
Chienyuan [Wed, 6 Nov 2019 15:20:31 +0000 (07:20 -0800)]
Merge "Cert: remove unregister_controllers" am:
0b682131d4
am:
84792df282
Change-Id: I185aaee02b15c79c94fa60ee89a86d8b34e09ae3
Chienyuan [Wed, 6 Nov 2019 15:14:00 +0000 (07:14 -0800)]
Merge "Cert: remove unregister_controllers"
am:
0b682131d4
Change-Id: Ic5af55421dfd1afd37cd7a3fe78f6383f28d2d6a
Treehugger Robot [Wed, 6 Nov 2019 12:17:16 +0000 (12:17 +0000)]
Merge "Cert: remove unregister_controllers"
Chris Manton [Wed, 6 Nov 2019 08:35:02 +0000 (00:35 -0800)]
Merge "Remove unused events in acl manager" am:
d5f1e626e0
am:
ab0af7316a
Change-Id: I42f4122bafb051656138068316a1faa9b00c696c
Chris Manton [Wed, 6 Nov 2019 08:29:02 +0000 (00:29 -0800)]
Merge "Remove unused events in acl manager"
am:
d5f1e626e0
Change-Id: I6de2afc50b952e3f0829feb82e045af01f06359d
Treehugger Robot [Wed, 6 Nov 2019 08:03:42 +0000 (08:03 +0000)]
Merge "Remove unused events in acl manager"
Chienyuan [Wed, 6 Nov 2019 08:02:42 +0000 (16:02 +0800)]
Cert: remove unregister_controllers
Bug:
144002854
Test: run_cert.sh
Change-Id: I3ec164e82f9a045a4c10dc08b941d8c4634ec984
Chris Manton [Tue, 5 Nov 2019 23:11:27 +0000 (15:11 -0800)]
Remove unused events in acl manager
Bug:
143697964
Test: Boots into gd without crashing
Change-Id: I344ef68cde2221b4d526c1fe347c92758f22b80a
Mitch Phillips [Wed, 6 Nov 2019 02:29:47 +0000 (18:29 -0800)]
Merge "Add avrcp_device_fuzz." am:
8466ef4d9c
am:
5b4270b8d1
Change-Id: I916b2c63bedd498c18ec00844458ad05dfde8f92
Mitch Phillips [Wed, 6 Nov 2019 02:24:06 +0000 (18:24 -0800)]
Merge "Add avrcp_device_fuzz."
am:
8466ef4d9c
Change-Id: I4680c634a6baf3615cf5cf21bf56786d6b8dd799
Treehugger Robot [Wed, 6 Nov 2019 02:05:41 +0000 (02:05 +0000)]
Merge "Add avrcp_device_fuzz."
Calvin Huang [Tue, 5 Nov 2019 23:07:23 +0000 (15:07 -0800)]
Merge "Rootcanal: Le resolving list hci cmds" am:
bb0d621d7a
am:
6b783be246
Change-Id: If9960f7bc6607dd6b6e2c61e832cbc3b74c85662
Calvin Huang [Tue, 5 Nov 2019 23:01:26 +0000 (15:01 -0800)]
Merge "Rootcanal: Le resolving list hci cmds"
am:
bb0d621d7a
Change-Id: I7436b677f50e972eaec75ac3ab2cf68e592887fb
Treehugger Robot [Tue, 5 Nov 2019 22:44:45 +0000 (22:44 +0000)]
Merge "Rootcanal: Le resolving list hci cmds"
Chris Manton [Tue, 5 Nov 2019 20:34:06 +0000 (12:34 -0800)]
Merge "Standardize l2cap shim naming" am:
7f2b95e390
am:
d94416aee0
Change-Id: I4b9112b475ec418fb136315f68cc8498f06fff54
Chris Manton [Tue, 5 Nov 2019 20:29:05 +0000 (12:29 -0800)]
Merge "Standardize l2cap shim naming"
am:
7f2b95e390
Change-Id: If53d309fd3263997b1548fc1fb5ca8ca98f2f4ba
Treehugger Robot [Tue, 5 Nov 2019 20:14:33 +0000 (20:14 +0000)]
Merge "Standardize l2cap shim naming"
Nick Desaulniers [Tue, 5 Nov 2019 20:08:52 +0000 (12:08 -0800)]
Merge "[system][bt] fix -Wimplicit-fallthrough" am:
119ba692eb
am:
d1453a1c09
Change-Id: I6f233f8903c32db7934470578d4a796a43c493d7
Nick Desaulniers [Tue, 5 Nov 2019 20:02:17 +0000 (12:02 -0800)]
Merge "[system][bt] fix -Wimplicit-fallthrough"
am:
119ba692eb
Change-Id: I442f92a48889168b428491515bee452cf84d96bb
Treehugger Robot [Tue, 5 Nov 2019 19:27:24 +0000 (19:27 +0000)]
Merge "[system][bt] fix -Wimplicit-fallthrough"
Chris Manton [Tue, 5 Nov 2019 05:11:18 +0000 (21:11 -0800)]
Standardize l2cap shim naming
Bug:
143697964
Test: bluetooth_test_gd
Change-Id: I565ba159c95848591780116b09655ff23edbe842
Martin Brabham [Tue, 5 Nov 2019 18:15:03 +0000 (10:15 -0800)]
Merge "Initial security manager API create/remove bond." am:
97935e845e
am:
538dc9f0ea
Change-Id: I2147d0e38785a02ba901af8b7ded513672048732
Martin Brabham [Tue, 5 Nov 2019 17:26:14 +0000 (09:26 -0800)]
Merge "Initial security manager API create/remove bond."
am:
97935e845e
Change-Id: I56563a361112134c54bcdb1858a8d0e576009e17
Treehugger Robot [Tue, 5 Nov 2019 16:57:05 +0000 (16:57 +0000)]
Merge "Initial security manager API create/remove bond."
Nick Desaulniers [Tue, 5 Nov 2019 09:35:55 +0000 (01:35 -0800)]
Merge "[system][bt] address -Wimplicit-fallthrough" am:
3266acff6f
am:
e59f2095c9
Change-Id: I4102d21026834b1bde6807425fb4c63706973add
Myles Watson [Tue, 5 Nov 2019 09:25:12 +0000 (01:25 -0800)]
HCI: Add Fragmentation am:
b6a5ecf540
am:
7e6fdb86a9
Change-Id: I6ccaf10f9105d520da04698caedfe264c1cf9a60
Calvin Huang [Fri, 1 Nov 2019 23:35:55 +0000 (16:35 -0700)]
Rootcanal: Le resolving list hci cmds
HciLeAddDeviceToResolvingList
HciLeRemoveDeviceFromResolvingList
HciLeClearResolvingList
HciLeSetPrivacyMode
Bug:
138260499
Test: run run_device_cert.sh
Change-Id: I6b9eb84d2fb3925ba556eeea7c52c7cc7b47aa44
Nick Desaulniers [Tue, 5 Nov 2019 01:36:13 +0000 (17:36 -0800)]
Merge "[system][bt] address -Wimplicit-fallthrough"
am:
3266acff6f
Change-Id: I28b4ad697522d385b004f92f837873baf8709313
Myles Watson [Tue, 5 Nov 2019 01:33:59 +0000 (17:33 -0800)]
HCI: Add Fragmentation
am:
b6a5ecf540
Change-Id: Icde40ad88494bc62b3e51b1b000057b35134e6e7
Nick Desaulniers [Tue, 5 Nov 2019 00:12:14 +0000 (00:12 +0000)]
Merge "[system][bt] address -Wimplicit-fallthrough"
Nick Desaulniers [Fri, 1 Nov 2019 16:05:35 +0000 (09:05 -0700)]
[system][bt] address -Wimplicit-fallthrough
The compiler upgrade in b/
139945549 can now check C code for
-Wimplicit-fallthrough. In b/
143713277, were moving the cflags for
projects that disable this warning to cppflags. For this subsystem, just
address the warnings and remove disabling it.
These cases should be carefully reviewed; modifications that weren't
additions of fallthrough attributes were likely existing bugs.
Bug:
139945549
Bug:
143713277
Test: mm
Change-Id: Icafeed1d18991e83f42e5efd13e8ab8d15068d79
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Myles Watson [Tue, 29 Oct 2019 23:31:14 +0000 (16:31 -0700)]
HCI: Add Fragmentation
Bug:
141921396
Test: builds
Change-Id: I9741755987461558509dbc22613cd9e26338af23
Nick Desaulniers [Mon, 4 Nov 2019 20:20:16 +0000 (12:20 -0800)]
Merge "[system][bt] fix -Wc99-designator" am:
341e3cb7c7
am:
23eb7f01e6
Change-Id: I46b18c886530ee2f5680f2dd6ab28a60c71c7187
Nick Desaulniers [Mon, 4 Nov 2019 20:12:16 +0000 (12:12 -0800)]
Merge "[system][bt] fix -Wc99-designator"
am:
341e3cb7c7
Change-Id: Iaee95ebfca731a69f996f9584f7df49d4c9c7ca9
Chris Manton [Mon, 4 Nov 2019 19:55:14 +0000 (11:55 -0800)]
Merge "Connect inquiry API query implementation" am:
512d6de79e
am:
854a807889
Change-Id: Ia90b50f5757d4f65c5c66c04682f3941916c805b
Treehugger Robot [Mon, 4 Nov 2019 19:54:27 +0000 (19:54 +0000)]
Merge "[system][bt] fix -Wc99-designator"
Chris Manton [Mon, 4 Nov 2019 19:48:51 +0000 (11:48 -0800)]
Merge "Connect inquiry API query implementation"
am:
512d6de79e
Change-Id: I7916dfbb8e0dc6ae57775b47d2ce484f9d46c63c
Hansong Zhang [Mon, 4 Nov 2019 19:48:51 +0000 (11:48 -0800)]
L2CAP: Dequeue next request if previous response is invalid am:
6f1ec72e73
am:
7b02ce62f0
Change-Id: I80f773959e0b4f5100bd15f3ca201d42c062e3d0
Hansong Zhang [Mon, 4 Nov 2019 19:43:04 +0000 (11:43 -0800)]
L2CAP: Dequeue next request if previous response is invalid
am:
6f1ec72e73
Change-Id: I8d9781c9d633d077dee5130cdb8b28a3cc73d8f9
Treehugger Robot [Mon, 4 Nov 2019 19:41:00 +0000 (19:41 +0000)]
Merge "Connect inquiry API query implementation"
Hansong Zhang [Mon, 4 Nov 2019 18:12:02 +0000 (10:12 -0800)]
L2CAP: Dequeue next request if previous response is invalid
If we drop the invalid response packet without dequeuing next request,
the outgoing request queue will stuck. We should dequeue it as long as
the signalling id matches.
Also fix the scid/dcid mismatch in cert stack.
Test: cert/run_cert.sh. test_open_two_channels should be fixed.
Bug:
141557006
Change-Id: Id4dd9f279ece55aa5e78443c8027df91af1dd7c8
Martin Brabham [Fri, 29 Mar 2019 19:02:30 +0000 (12:02 -0700)]
Initial security manager API create/remove bond.
- Main manager implementation and tests
- Channel implementation and tests
Bug:
142341184
Test: atest --host -t bluetooth_test_gd:SecurityManagerTest bluetooth_test_gd:SecurityManagerChannelTest
Change-Id: I6291b1219d2e5cde6a4d770c9267e20860a164ae
Chris Manton [Mon, 4 Nov 2019 18:00:55 +0000 (10:00 -0800)]
Connect inquiry API query implementation
Bug:
143697964
Test: Verified inquiry sequence on actual device
Change-Id: I75721aa2db56c6fa28d322d3b08a32991e6d37b1
Martin Brabham [Mon, 4 Nov 2019 17:59:19 +0000 (09:59 -0800)]
Merge "Return matching device in CreateDatabase when called twice" am:
64c649904e
am:
b6cdab8a8e
Change-Id: I2ae800442466fc513e0325502bcc99058b85ebc9
Calvin Huang [Mon, 4 Nov 2019 17:58:49 +0000 (09:58 -0800)]
Merge "RootCanal:Add Hci cmds" am:
2b3c42a964
am:
d4694ccaad
Change-Id: I3ce56faab491f8bc266fb663c8b901c81d9cb41a
Martin Brabham [Mon, 4 Nov 2019 17:53:34 +0000 (09:53 -0800)]
Merge "Return matching device in CreateDatabase when called twice"
am:
64c649904e
Change-Id: I1771c66b66b52c59bd72e826cac6befa18645b8e
Calvin Huang [Mon, 4 Nov 2019 17:53:03 +0000 (09:53 -0800)]
Merge "RootCanal:Add Hci cmds"
am:
2b3c42a964
Change-Id: I95b997343754c6849cf8e5d14334d4c6ece95292
Treehugger Robot [Mon, 4 Nov 2019 17:41:30 +0000 (17:41 +0000)]
Merge "Return matching device in CreateDatabase when called twice"
Martin Brabham [Mon, 4 Nov 2019 03:11:55 +0000 (19:11 -0800)]
Return matching device in CreateDatabase when called twice
Bug: N/A
Test: atest --host -t bluetooth_test_gd:DeviceTest bluetooth_test_gd:DeviceDatabaseTest bluetooth_test_gd:DualDeviceTest
Change-Id: Ic8df7da1f3f003994acbdde773e2131b614d3def
Treehugger Robot [Mon, 4 Nov 2019 17:38:12 +0000 (17:38 +0000)]
Merge "RootCanal:Add Hci cmds"
Chienyuan [Sun, 3 Nov 2019 00:42:26 +0000 (17:42 -0700)]
Merge "RootCanal: Upgrade the LinkLayer in RootCanal to PDL" am:
0c9f7ee2cb
am:
0b427c9760
Change-Id: Ibba3f745e69be6fb6ab38e38af519ed0bf30e2c3
Chienyuan [Sun, 3 Nov 2019 00:36:29 +0000 (17:36 -0700)]
Merge "RootCanal: Upgrade the LinkLayer in RootCanal to PDL"
am:
0c9f7ee2cb
Change-Id: I26fcbdbbaa906a0cf6b6beae014fc369cd3da176
Treehugger Robot [Sun, 3 Nov 2019 00:28:31 +0000 (00:28 +0000)]
Merge "RootCanal: Upgrade the LinkLayer in RootCanal to PDL"
Chris Manton [Fri, 1 Nov 2019 22:30:26 +0000 (15:30 -0700)]
Merge "Expose psm value through l2cap classic service" am:
e63a120951
am:
d0f4802061
Change-Id: Ic2cd7b03cc0bf7585ae10b6704e7536b6ddb5f81
Chris Manton [Fri, 1 Nov 2019 22:22:29 +0000 (15:22 -0700)]
Merge "Expose psm value through l2cap classic service"
am:
e63a120951
Change-Id: I15d9c9004429ad052611a20f3c44f3e638d8989c
Treehugger Robot [Fri, 1 Nov 2019 21:59:08 +0000 (21:59 +0000)]
Merge "Expose psm value through l2cap classic service"
Chris Manton [Fri, 1 Nov 2019 21:15:03 +0000 (14:15 -0700)]
Merge "Use proper PBF boundary for upper layer packets" am:
61b86ee115
am:
e728cf6a69
Change-Id: Ia2e4c8b889c250a34021935ff3ee97722a678d5e
Chris Manton [Fri, 1 Nov 2019 21:08:03 +0000 (14:08 -0700)]
Merge "Use proper PBF boundary for upper layer packets"
am:
61b86ee115
Change-Id: Ieda83730679b5e0369750fd857675082511086db
Chris Manton [Fri, 1 Nov 2019 20:46:16 +0000 (20:46 +0000)]
Merge "Use proper PBF boundary for upper layer packets"
Chris Manton [Fri, 1 Nov 2019 20:28:45 +0000 (13:28 -0700)]
Expose psm value through l2cap classic service
Test: Compiles
Bug:
143697964
Change-Id: I87c81491581fb55bda942f26f3fa3a6bf4989a08
Nick Desaulniers [Fri, 1 Nov 2019 20:25:56 +0000 (13:25 -0700)]
[system][bt] fix -Wc99-designator
Fixes the observed warning:
error: mixture of designated and non-designated initializers in the same
initializer list is a C99 extension [-Werror,-Wc99-designator]
Bug:
143622397
Test: mm
Change-Id: I5835e729979d8fb3f928821d4cd6aff693b14ab7
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Chris Manton [Fri, 1 Nov 2019 18:04:04 +0000 (11:04 -0700)]
Merge "Add information request after acl connect" am:
f207913f6d
am:
081c42c919
Change-Id: I75197df5f7d4ade0ed701047875ad65d846dc595
Chris Manton [Fri, 1 Nov 2019 18:03:41 +0000 (11:03 -0700)]
Merge changes I238c23f5,I7c7b8045 am:
56d3bc0d21
am:
8f77f3bb26
Change-Id: Ic31a0447930a3b7c02504b404be3716509378760
Chris Manton [Fri, 1 Nov 2019 17:57:47 +0000 (10:57 -0700)]
Merge "Add information request after acl connect"
am:
f207913f6d
Change-Id: Ieb99220a0fd0aafa0eed34864528172aeeff2561
Chris Manton [Fri, 1 Nov 2019 17:57:19 +0000 (10:57 -0700)]
Merge changes I238c23f5,I7c7b8045
am:
56d3bc0d21
Change-Id: I130edc1ecea001a94f02d7c70bfc86a1c2e5ac79
Treehugger Robot [Fri, 1 Nov 2019 17:31:34 +0000 (17:31 +0000)]
Merge "Add information request after acl connect"
Treehugger Robot [Fri, 1 Nov 2019 17:31:28 +0000 (17:31 +0000)]
Merge changes I238c23f5,I7c7b8045
* changes:
Extend l2cap functionality for CoC
Swap cid parameters
Chienyuan [Thu, 31 Oct 2019 06:01:28 +0000 (14:01 +0800)]
RootCanal: Upgrade the LinkLayer in RootCanal to PDL
Bug:
140384404
Test: run_cert.sh
Change-Id: I913c345f7bd6eb258c3c70ebce1a38a1fa4a764f
Hansong Zhang [Fri, 1 Nov 2019 05:27:40 +0000 (22:27 -0700)]
Merge "HCI Classic ACL: Queue pending connection requests" am:
b6f973ee83
am:
be52e768f9
Change-Id: Ia11fa4eafa3575e3ecc858ada25d8105e27a0f6f
Hansong Zhang [Fri, 1 Nov 2019 05:21:39 +0000 (22:21 -0700)]
Merge "HCI Classic ACL: Queue pending connection requests"
am:
b6f973ee83
Change-Id: I3af0ca8d9104e261592c7ebcd7a354625e2f4cfc
Treehugger Robot [Fri, 1 Nov 2019 05:15:32 +0000 (05:15 +0000)]
Merge "HCI Classic ACL: Queue pending connection requests"
Chris Manton [Thu, 31 Oct 2019 21:36:02 +0000 (14:36 -0700)]
Add information request after acl connect
The 2 information requests are optional, but convention
by legacy android stack and other devices I've tested against
send these commands after acl connection.
Bug:
143697964
Test: Verified on actual device with wireshark
Change-Id: Idd651ac30e8d843c88105f4145756320c0f68902
Chris Manton [Fri, 1 Nov 2019 03:39:11 +0000 (20:39 -0700)]
Extend l2cap functionality for CoC
Keep packets flowing after reception
Add search for channel using remote id
Bug:
143697964
Test: Verified using wireshark
Change-Id: I238c23f58f215316223bf28548422759016bc8ab
Chris Manton [Thu, 31 Oct 2019 23:19:14 +0000 (16:19 -0700)]
Swap cid parameters
Confusingly the destination cid in this packet is actually the cid
of the remote and the source cid is the cid of the local.
Bug:
143697964
Test: Verified correct behavior on wireshark
Change-Id: I7c7b80458d91c2cbd48b5990ae9202fc062cd59b
Chris Manton [Thu, 31 Oct 2019 21:32:18 +0000 (14:32 -0700)]
Use proper PBF boundary for upper layer packets
Test: Verified with legacy stack
Bug:
143697964
Change-Id: I13a602e08c337180767b0a219804c964a5947506
Calvin Huang [Fri, 1 Nov 2019 02:12:25 +0000 (19:12 -0700)]
RootCanal:Add Hci cmds
Add HciReadEncryptionKeySize and HciWriteSecureConnectionHostSupport
Bug:
138260499
Test: run run_device_cert.sh
Change-Id: Icd49a9e0b3fbbbeedf180946a8ba4801ea18a2b8
Myles Watson [Fri, 1 Nov 2019 00:07:57 +0000 (17:07 -0700)]
Merge changes Iec8b53b8,I6f74be04 am:
e4fe73706e
am:
755c63ef2a
Change-Id: Ieb5634a5673fe49aa6ea63369162348b4370ca3b
Myles Watson [Thu, 31 Oct 2019 23:56:03 +0000 (16:56 -0700)]
Merge changes Iec8b53b8,I6f74be04
am:
e4fe73706e
Change-Id: I9ac3517f64071375dcb0cbd26e142e61c4854157
Treehugger Robot [Thu, 31 Oct 2019 23:43:02 +0000 (23:43 +0000)]
Merge changes Iec8b53b8,I6f74be04
* changes:
packet: Add Fragmentation
packet: Add Append for reassembly
Hansong Zhang [Thu, 31 Oct 2019 16:50:08 +0000 (09:50 -0700)]
HCI Classic ACL: Queue pending connection requests
* Send next connection request after connection_complete event, if there
is already a pending outgoing connection_request,
accept_connection_request, or reject_connection_request.
* Don't allow sending connection_request, or accept connection, if there
is already a device with same Address connected.
* Also fix a memory leak in grpc_root_server and inquiry_test.
Bug:
143620554
Test: bluetooth_test_gd and cert/run_cert.sh
Change-Id: I4ea321eafa7857bfa3ad3fdfa0ebfa07a162ff4b
Xin Li [Thu, 31 Oct 2019 22:10:54 +0000 (15:10 -0700)]
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master" into stage-aosp-master
am:
d42af7757f
Change-Id: I1f45bc0d3677d1b795b3ad46788b610f3b7cb2d7
Myles Watson [Tue, 29 Oct 2019 23:31:14 +0000 (16:31 -0700)]
packet: Add Fragmentation
Bug:
141921396
Test: builds
Change-Id: Iec8b53b83b9ba3efbee8b45738161d3db5cf0837
Myles Watson [Wed, 30 Oct 2019 18:19:48 +0000 (11:19 -0700)]
packet: Add Append for reassembly
Bug:
141921396
Test: bluetooth_test_gd --gtest_filter=*MultiViewAppend*
Change-Id: I6f74be0406bb2fae5713782dee0f6874386d7e17
Xin Li [Thu, 31 Oct 2019 20:24:15 +0000 (13:24 -0700)]
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master
am:
b51b5e8011
Change-Id: I3b11a4cfa8ad7160a4717d7ba98dfd740f04a028
TreeHugger Robot [Thu, 31 Oct 2019 18:38:50 +0000 (18:38 +0000)]
Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master" into stage-aosp-master
Hansong Zhang [Thu, 31 Oct 2019 17:13:47 +0000 (10:13 -0700)]
Merge changes I9693f8e4,I3568a3dc am:
56fb21419f
am:
99da3a6158
Change-Id: I7acfa5f6c47d629f2b122e3aeee72116c0b945e2
Hansong Zhang [Thu, 31 Oct 2019 17:01:47 +0000 (10:01 -0700)]
Merge changes I9693f8e4,I3568a3dc
am:
56fb21419f
Change-Id: I01a0c0df72e01da859dfb84ee437439efa4521f1
Treehugger Robot [Thu, 31 Oct 2019 16:35:47 +0000 (16:35 +0000)]
Merge changes I9693f8e4,I3568a3dc
* changes:
L2CAP Classic Cert: Auto generate cid for incoming request
L2CAP: Fix SignallingManager request queuing
Chris Manton [Thu, 31 Oct 2019 06:25:04 +0000 (23:25 -0700)]
Merge "Signal id of zero is silently ignored per spec" am:
0d739b0da2
am:
335da88275
Change-Id: Ie0f41a465b707d0da0d0731086111efa7771dd15
Chris Manton [Thu, 31 Oct 2019 06:19:37 +0000 (23:19 -0700)]
Merge "Signal id of zero is silently ignored per spec"
am:
0d739b0da2
Change-Id: I2726be8bf93bd483d8ff33b83b53a949b2bdb1ea
Treehugger Robot [Thu, 31 Oct 2019 05:53:42 +0000 (05:53 +0000)]
Merge "Signal id of zero is silently ignored per spec"
Chris Manton [Thu, 31 Oct 2019 00:27:59 +0000 (17:27 -0700)]
Merge changes I33b0ace1,I3af9a79d am:
e7fb7c087d
am:
8938cd3f66
Change-Id: I12ca664fb18524eada2f208d36bc99b75b59bd3c
Chris Manton [Thu, 31 Oct 2019 00:22:00 +0000 (17:22 -0700)]
Merge changes I33b0ace1,I3af9a79d
am:
e7fb7c087d
Change-Id: I9b069f443e789943f352c002c5e2916cd594a5d4
Treehugger Robot [Thu, 31 Oct 2019 00:01:36 +0000 (00:01 +0000)]
Merge changes I33b0ace1,I3af9a79d
* changes:
Separate out connect actions for initiate/target
Remove channel connection timeouts
Hansong Zhang [Wed, 30 Oct 2019 23:43:39 +0000 (16:43 -0700)]
L2CAP Classic Cert: Auto generate cid for incoming request
Previously the scid on cert side was hardcoded. Instead, let the cert
stack generate one, from kFirstDynamicChannelForIncomingRequest.
Test: run_cert_test
Bug:
143543622
Change-Id: I9693f8e4666c80bb62fedd0d94163e38f71211ae
Colin Cross [Wed, 30 Oct 2019 23:14:38 +0000 (16:14 -0700)]
Merge "Revert "RootCanal: Upgrade the LinkLayer in RootCanal to PDL"" am:
0634491d10
am:
cd5f4b2317
Change-Id: Ied6c793f68de06fd39ab4ff470b5af48de83484a
Colin Cross [Wed, 30 Oct 2019 21:38:07 +0000 (14:38 -0700)]
Merge "Revert "RootCanal: Upgrade the LinkLayer in RootCanal to PDL""
am:
0634491d10
Change-Id: I7e3cc7c54ba0eb5baeb5bf4a7b3ea965ce9ec128
Hansong Zhang [Mon, 28 Oct 2019 21:55:02 +0000 (14:55 -0700)]
L2CAP: Fix SignallingManager request queuing
We should always wait for an outgoing request to be handled before
sending the next one. Fix the logic in queuing.
Test: run_cert_test.sh
Bug:
141557006
Change-Id: I3568a3dca4857f1ba4fa47618408f40e2f1f7d04
Colin Cross [Wed, 30 Oct 2019 20:39:36 +0000 (20:39 +0000)]
Merge "Revert "RootCanal: Upgrade the LinkLayer in RootCanal to PDL""
Xin Li [Wed, 30 Oct 2019 18:50:41 +0000 (11:50 -0700)]
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master
Bug:
142003500
Change-Id: I9273c7462b91567750d149aee63f91635e1c3fc9
OSDN Git Service
