OSDN Git Service
Automerger Merge Worker [Tue, 28 Jan 2020 20:17:02 +0000 (20:17 +0000)]
Reduce logspam in AclManager am:
0aef0449ad am:
3ab137a02f
Change-Id: I19ebc46debc8e6479e9db55cee88fc4d6b2ff331
Automerger Merge Worker [Tue, 28 Jan 2020 20:01:13 +0000 (20:01 +0000)]
Reduce logspam in AclManager am:
0aef0449ad
Change-Id: I7368d9c67dba938b5e3eb8202e342caee6f955b2
Jakub Pawlowski [Mon, 27 Jan 2020 15:21:12 +0000 (16:21 +0100)]
Reduce logspam in AclManager
Bug:
142341141
Test: receive long packet, verify next received packet doesn't print out
"Dropping invalid packet" line.
Change-Id: I5bd2ecf4200ec030a26d0313a528ff51531d6688
Automerger Merge Worker [Tue, 28 Jan 2020 03:43:31 +0000 (03:43 +0000)]
Merge "Move compiled grpc py to dist" am:
4666fbaa86 am:
48d8ae63aa
Change-Id: I576f233f3c1c44aaa2db17a99d7c874e7f0737e1
Hansong Zhang [Tue, 28 Jan 2020 03:36:40 +0000 (19:36 -0800)]
Merge "Move compiled grpc py to dist"
am:
4666fbaa86
Change-Id: Ibd2a5943f108ddd06816bf0551f3abd53fc49697
Treehugger Robot [Tue, 28 Jan 2020 03:28:32 +0000 (03:28 +0000)]
Merge "Move compiled grpc py to dist"
Automerger Merge Worker [Tue, 28 Jan 2020 02:54:23 +0000 (02:54 +0000)]
L2CAP Socket: Keep track of last allocated socket ID am:
79eda3270b am:
c6e06c4cb7
Change-Id: Ie47a98e674ab3c2e2fb53ab05cf3edb4b02acbf3
Jack He [Tue, 28 Jan 2020 02:44:48 +0000 (18:44 -0800)]
L2CAP Socket: Keep track of last allocated socket ID
am:
79eda3270b
Change-Id: I65aafab76ca7c140e678e51f7272e7323dab0c0a
Jack He [Tue, 28 Jan 2020 01:09:17 +0000 (17:09 -0800)]
L2CAP Socket: Keep track of last allocated socket ID
* Keep track of last allocated socket ID in L2CAP socket stack
* Use last_sock_id + 1 as new IDs when allocating new socket blocks
* The de-dupe and overflow detection mechanism in btsock_l2cap_alloc_l()
would handle the uint32_t overflow and duplicate ID cases
Test: CtsBluetoothTestCases
Bug:
144148429
Change-Id: Ieb9791ffa34eef919a32e4aff6f4b514859c69c0
Hansong Zhang [Tue, 28 Jan 2020 00:49:29 +0000 (16:49 -0800)]
Move compiled grpc py to dist
Currently we are using intermediate directory, which is unreliable.
Instead, zip all generated files and move it to dist target.
Add dist directory to temporary Python path, and run cert.
Bug:
148147248
Test: cert/run_cert.sh, cert/run_cert_facade_only.sh
Change-Id: I7daeb12247e3474ca4a4e20e94c20a7b83a21fad
Automerger Merge Worker [Mon, 27 Jan 2020 23:31:48 +0000 (23:31 +0000)]
LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed am:
8d2c8ba573
Change-Id: I7bf3f416ed664b28b87cd4cdeff6c6a84ac1cc4b
Automerger Merge Worker [Mon, 27 Jan 2020 22:33:57 +0000 (22:33 +0000)]
Merge "gd: Register close callback prior to channel acquire" am:
fcc62f8090 am:
68d2ffc978
Change-Id: I92c62a83463c425edfd171df9e262db458f9e7bc
Chris Manton [Mon, 27 Jan 2020 22:24:54 +0000 (14:24 -0800)]
Merge "gd: Register close callback prior to channel acquire"
am:
fcc62f8090
Change-Id: Ib2440215240eaaf2d394e401c6d39ebd1290c3d5
Treehugger Robot [Mon, 27 Jan 2020 22:20:57 +0000 (22:20 +0000)]
Merge "gd: Register close callback prior to channel acquire"
Automerger Merge Worker [Mon, 27 Jan 2020 22:16:13 +0000 (22:16 +0000)]
Merge "Remove unused HCI cert" am:
0bc34a3b18 am:
af35c2742e
Change-Id: Ia78d1739253798fc6e2d9002863e1ffdd7dd624e
Jack He [Fri, 17 Jan 2020 00:20:06 +0000 (16:20 -0800)]
LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed
* When BluetoothServerSocket is closed in the Java layer, the native
layer should respond by freeing all resources used by the server
including file descriptors, structs, PSMs, and security IDs
* We did this correctly for BR_EDR L2CAP COC channels after
I4e37dcd858af258fbd64fbfb2fbf0083bd743e06, but the same fix did not
apply to LE COC
* This CL make sure LE COC server resources are freed propertly upon
server fd closure
Test: open and close LE COC server repeatedly on an Android phone
Fixes:
144148429
Change-Id: I16fa10e77612105d23848f71925ff6efc95bc75a
(cherry picked from commit
d3c9966624530772fbdc469179726bd9191314c5)
Hansong Zhang [Mon, 27 Jan 2020 21:56:41 +0000 (13:56 -0800)]
Merge "Remove unused HCI cert"
am:
0bc34a3b18
Change-Id: I391dfdb81b7fa11eced82ab21f82e8bde400e34c
Treehugger Robot [Mon, 27 Jan 2020 21:52:30 +0000 (21:52 +0000)]
Merge "Remove unused HCI cert"
Automerger Merge Worker [Mon, 27 Jan 2020 21:49:29 +0000 (21:49 +0000)]
Merge "Improve cert set up" am:
4879523ac4 am:
00eebca7a9
Change-Id: I771679908efd3c03f9358305b99975ab33794b51
Hansong Zhang [Mon, 27 Jan 2020 21:40:42 +0000 (13:40 -0800)]
Merge "Improve cert set up"
am:
4879523ac4
Change-Id: Ic554f3cb1325314a9e3a16304adc1b99e5134cc4
Treehugger Robot [Mon, 27 Jan 2020 21:31:16 +0000 (21:31 +0000)]
Merge "Improve cert set up"
Automerger Merge Worker [Mon, 27 Jan 2020 19:35:55 +0000 (19:35 +0000)]
gd: Remove using directive from shim header file am:
d605556a3b am:
b305ebc76e
Change-Id: I62da94241392ee667332d00e46f5fe3785074efe
Chris Manton [Mon, 27 Jan 2020 19:20:29 +0000 (11:20 -0800)]
gd: Remove using directive from shim header file
am:
d605556a3b
Change-Id: I4c7c650eb6f341a7fb0b6777cc14def0937d56a9
Hansong Zhang [Fri, 24 Jan 2020 23:11:46 +0000 (15:11 -0800)]
Remove unused HCI cert
Test: cert/run_cert.sh
Change-Id: I48ce5068ea6f41b053ea5ac2be0441fbd44bca88
Chris Manton [Mon, 27 Jan 2020 18:21:40 +0000 (10:21 -0800)]
gd: Register close callback prior to channel acquire
The underlying implementation enforces this with ASSERT
Bug:
144170448
Test: CtsVerifier HID host test
Change-Id: I65e023e4a523deb9a8aa8edd41a3592a600ffb8e
Hansong Zhang [Fri, 24 Jan 2020 22:40:41 +0000 (14:40 -0800)]
Improve cert set up
Test: cert/run_cert.sh and cert/run_cert_facade_only.sh
Bug:
148147248
Change-Id: Ie8bddde7a7fe3b8c7f213be254645549115ec866
Chris Manton [Mon, 27 Jan 2020 17:51:54 +0000 (09:51 -0800)]
gd: Remove using directive from shim header file
Bug:
144170448
Test: bluetooth_test_legacy
Change-Id: I2c94aa18d4a993bbf5a198ae1a39e8065dc599c6
Automerger Merge Worker [Mon, 27 Jan 2020 06:14:20 +0000 (06:14 +0000)]
gd: Refactor how psms are un/registered in shim am:
5dc119a0a7 am:
6ff637b40a
Change-Id: I784e092212a3ad4569846f05c0fcff7978fa7e4f
Chris Manton [Mon, 27 Jan 2020 06:05:47 +0000 (22:05 -0800)]
gd: Refactor how psms are un/registered in shim
am:
5dc119a0a7
Change-Id: I84bec6b9315c70c76458fe52f4147209213c98a3
Chris Manton [Fri, 24 Jan 2020 22:13:33 +0000 (14:13 -0800)]
gd: Refactor how psms are un/registered in shim
Bug:
144170448
Test: CtsVerifier install/remove verifier PSM services
Change-Id: I3849bb60c308cf9a7cda56aec8978e9ede3f3787
Automerger Merge Worker [Sat, 25 Jan 2020 00:25:23 +0000 (00:25 +0000)]
Cert: Append to Python path in command only am:
5057dc59ae am:
4c0701fd6a
Change-Id: I330363e8af248d82316eab60d3f0b47b3648724c
Automerger Merge Worker [Sat, 25 Jan 2020 00:25:17 +0000 (00:25 +0000)]
Add bluetooth_packets_python3 and proto to zip am:
d9d0cb497e am:
501fbe2238
Change-Id: If89fe6fa12bdd8ba50b967a908ead229244fe0f8
Hansong Zhang [Sat, 25 Jan 2020 00:20:59 +0000 (16:20 -0800)]
Cert: Append to Python path in command only
am:
5057dc59ae
Change-Id: I3d086bdbaaa975624c6fbccae9ac63d601b7c3f9
Hansong Zhang [Sat, 25 Jan 2020 00:15:45 +0000 (16:15 -0800)]
Add bluetooth_packets_python3 and proto to zip
am:
d9d0cb497e
Change-Id: I6c8b77085c7e9502f1870fc8ed93856a8eceab8c
Hansong Zhang [Fri, 24 Jan 2020 22:17:05 +0000 (14:17 -0800)]
Cert: Append to Python path in command only
Test: cert/run_cert.sh and cert/run_cert_facade_only.sh
Bug:
148147248
Change-Id: I828d6d38d1338a730b303ebf090c6b7706211371
Hansong Zhang [Fri, 24 Jan 2020 21:40:32 +0000 (13:40 -0800)]
Add bluetooth_packets_python3 and proto to zip
Bug:
148147248
Test: make
Change-Id: I981b1a171538ab5ff47ac59a6bfda0472b8cbe69
Automerger Merge Worker [Fri, 24 Jan 2020 21:20:50 +0000 (21:20 +0000)]
Merge "gd shim l2cap_test" am:
1140f7bd22 am:
43f072d3bd
Change-Id: If316ffc84994f08e78db406b8106738d74e2e103
Chris Manton [Fri, 24 Jan 2020 21:08:15 +0000 (13:08 -0800)]
Merge "gd shim l2cap_test"
am:
1140f7bd22
Change-Id: I3c5b063ddd81c808d5955c773c891880ece86380
Treehugger Robot [Fri, 24 Jan 2020 20:17:06 +0000 (20:17 +0000)]
Merge "gd shim l2cap_test"
Chris Manton [Thu, 23 Jan 2020 00:34:35 +0000 (16:34 -0800)]
gd shim l2cap_test
Also avoid holding a memory in unique_ptr
Bug:
146086425
Test: bluetooth_test_gd
Change-Id: I23ac9eaced5f2426b26cd7fb0d041adf578315d0
Automerger Merge Worker [Fri, 24 Jan 2020 19:10:49 +0000 (19:10 +0000)]
Add device artifacts to bluetooth_cert_test.zip am:
c4b7de7cb0 am:
d6569eb2ae
Change-Id: I6463a967b94d53811ce64145918b6e529c129307
Hansong Zhang [Fri, 24 Jan 2020 19:04:53 +0000 (11:04 -0800)]
Add device artifacts to bluetooth_cert_test.zip
am:
c4b7de7cb0
Change-Id: Ib548753ec9d55e40ba821274e3daf9129a00ae08
Hansong Zhang [Fri, 24 Jan 2020 18:10:10 +0000 (10:10 -0800)]
Add device artifacts to bluetooth_cert_test.zip
Test: m dist bluetooth_stack_with_facade
Change-Id: I08d722e21300c8a3bfcb393c3a9ec1cefe22d8e2
Automerger Merge Worker [Thu, 23 Jan 2020 23:48:06 +0000 (23:48 +0000)]
Add required binaries to zip file am:
6f4866ea91 am:
3fa6a50727
Change-Id: I557854043f3af6aba25c4624427901ab9ccb043f
Automerger Merge Worker [Thu, 23 Jan 2020 23:32:36 +0000 (23:32 +0000)]
Add required binaries to zip file am:
6f4866ea91
Change-Id: I2f5be3a12627819bf6414f0d293b00638d99f427
Hansong Zhang [Thu, 23 Jan 2020 21:44:33 +0000 (13:44 -0800)]
Add required binaries to zip file
Bug:
148147248
Test: build
Change-Id: I87b96b05975ae9e66fb1fd78d185f911b809706c
Automerger Merge Worker [Thu, 23 Jan 2020 21:37:09 +0000 (21:37 +0000)]
Use bluetooth_stack_with_facade as dist target am:
5298d9ffa3 am:
a5c20048d0
Change-Id: I7b1907e2a9e090d1bb77016ad4288a1f3918281a
Hansong Zhang [Thu, 23 Jan 2020 21:14:21 +0000 (13:14 -0800)]
Use bluetooth_stack_with_facade as dist target
am:
5298d9ffa3
Change-Id: I7195a966fe0458ce311ea42899d490d218df804a
Hansong Zhang [Wed, 22 Jan 2020 00:03:53 +0000 (16:03 -0800)]
Use bluetooth_stack_with_facade as dist target
And let bluetooth_stack_with_facade require root-canal
Test: m dist bluetooth_stack_with_facade -j50
Bug:
148147248
Change-Id: I6b4651042cb6bb5769d96575ac61a8f192381d3c
Automerger Merge Worker [Wed, 22 Jan 2020 22:39:37 +0000 (22:39 +0000)]
SecurityModule: Add callbacks to your callbacks am:
6fd5b6bec7 am:
aaaf6c5902
Change-Id: I89215122e1a32f5500e7b1c79748216d7c784285
Martin Brabham [Wed, 22 Jan 2020 22:23:42 +0000 (14:23 -0800)]
SecurityModule: Add callbacks to your callbacks
am:
6fd5b6bec7
Change-Id: Id2cc55acf5c3efa6915eca855704825e716caf97
Automerger Merge Worker [Wed, 22 Jan 2020 20:11:17 +0000 (20:11 +0000)]
L2cap/Hci: Add call for feature exchange am:
10b62ca89f am:
6ed8790afe
Change-Id: I03b3390f8ef924eead45fa7db1c12152876b3ac2
Martin Brabham [Wed, 22 Jan 2020 19:59:11 +0000 (11:59 -0800)]
L2cap/Hci: Add call for feature exchange
am:
10b62ca89f
Change-Id: Ifd7dae3eedeb35948fef92a8194181d7815ebaab
Martin Brabham [Thu, 16 Jan 2020 19:18:42 +0000 (11:18 -0800)]
SecurityModule: Add callbacks to your callbacks
Add an argument to the external callback signature in order
to allow external caller to input user responses.
Bug:
139137147
Test: ./out/host/linux-x86/nativetest64/bluetooth_test_gd/bluetooth_test_gd --gtest_filter=ClassicPairing*
Change-Id: Ib827991dd2827ec0bad0206192387ad66696d740
Automerger Merge Worker [Wed, 22 Jan 2020 18:15:24 +0000 (18:15 +0000)]
Merge "Zip cert resources and scripts" am:
a8e924c0cf am:
5a0712ca1a
Change-Id: Ic606cf043eb37dda526ab2fc9c10325c17cc46cb
Martin Brabham [Thu, 16 Jan 2020 23:49:59 +0000 (15:49 -0800)]
L2cap/Hci: Add call for feature exchange
Bug:
145638034
Test: N/A
Change-Id: I811856672663874928b98137f16e6aee2e612caf
Hansong Zhang [Wed, 22 Jan 2020 17:59:22 +0000 (09:59 -0800)]
Merge "Zip cert resources and scripts"
am:
a8e924c0cf
Change-Id: I1f458530cd512d25522c5d829a9f0967e98c9d00
Treehugger Robot [Wed, 22 Jan 2020 17:43:45 +0000 (17:43 +0000)]
Merge "Zip cert resources and scripts"
Automerger Merge Worker [Wed, 22 Jan 2020 04:19:07 +0000 (04:19 +0000)]
Merge "Cert: Check that child returns 0 or -signal" am:
a74dfac562 am:
cd17421c58
Change-Id: Idc60c27a36e5f260295830d88c40c7da3d009b34
Myles Watson [Wed, 22 Jan 2020 04:04:28 +0000 (20:04 -0800)]
Merge "Cert: Check that child returns 0 or -signal"
am:
a74dfac562
Change-Id: I048ad5c5c0ec9718b43ef076bc89f25f911ede70
Treehugger Robot [Wed, 22 Jan 2020 03:27:26 +0000 (03:27 +0000)]
Merge "Cert: Check that child returns 0 or -signal"
Automerger Merge Worker [Wed, 22 Jan 2020 00:26:28 +0000 (00:26 +0000)]
Merge "gd: Fix for l2cap connection on failure" am:
2898ad8efd am:
70d3b8e4c1
Change-Id: Ib3c01811c71896b3a56ad74120dc2400e102d99b
Automerger Merge Worker [Wed, 22 Jan 2020 00:26:17 +0000 (00:26 +0000)]
Merge "HCI: Add LocalName test" am:
31e43edf83 am:
431f0d18cb
Change-Id: I936052bdf15328e99ab5bdda8fac9fca749d847b
Chris Manton [Wed, 22 Jan 2020 00:17:08 +0000 (16:17 -0800)]
Merge "gd: Fix for l2cap connection on failure"
am:
2898ad8efd
Change-Id: I6914a456964dbd0ffc73d57d7901951bd332d33b
Myles Watson [Wed, 22 Jan 2020 00:16:29 +0000 (16:16 -0800)]
Merge "HCI: Add LocalName test"
am:
31e43edf83
Change-Id: I137ddd270e8ab32ac5ee207754361d623ab0e52e
Treehugger Robot [Wed, 22 Jan 2020 00:12:27 +0000 (00:12 +0000)]
Merge "gd: Fix for l2cap connection on failure"
Treehugger Robot [Wed, 22 Jan 2020 00:11:20 +0000 (00:11 +0000)]
Merge "HCI: Add LocalName test"
Automerger Merge Worker [Wed, 22 Jan 2020 00:08:08 +0000 (00:08 +0000)]
Merge "Initial entry for headless" am:
562ec8ffd5 am:
f060d956c5
Change-Id: I7accffa71e65cea88c20dab802b69875e51e52d8
Hansong Zhang [Mon, 13 Jan 2020 23:47:22 +0000 (15:47 -0800)]
Zip cert resources and scripts
Test: compile
Change-Id: Ib11e566273a3bdd62ad791d0a66d36ebde5d6f39
Chris Manton [Tue, 21 Jan 2020 23:59:30 +0000 (15:59 -0800)]
Merge "Initial entry for headless"
am:
562ec8ffd5
Change-Id: Ib413fd98722a37ccbc703a5c3d253fa68fd1c5f1
Treehugger Robot [Tue, 21 Jan 2020 23:56:10 +0000 (23:56 +0000)]
Merge "Initial entry for headless"
Automerger Merge Worker [Tue, 21 Jan 2020 23:48:00 +0000 (23:48 +0000)]
Split ports for device and root-canal tests am:
82ec67d4fb am:
1d66ad4fc7
Change-Id: Id0df211cde01e3d297b70103b1b8e48a06753221
Myles Watson [Tue, 21 Jan 2020 23:32:17 +0000 (15:32 -0800)]
Split ports for device and root-canal tests
am:
82ec67d4fb
Change-Id: I7cd54d1ebbaa376980dc4eb258258834e3084e47
Myles Watson [Fri, 17 Jan 2020 17:37:25 +0000 (09:37 -0800)]
HCI: Add LocalName test
Bug:
147444951
Test: ./cert/run_device_cert.sh
Change-Id: I9d3345d2316357beac727c9245134a8994aba25b
Chris Manton [Tue, 21 Jan 2020 19:34:00 +0000 (11:34 -0800)]
gd: Fix for l2cap connection on failure
Included method and parameter naming updates to reflect functionality
Bug:
140778599
Test: bt_headless with failing params
Change-Id: I5ed4e2769f7c8f6f78a92af76545e3a0e41582d1
Chris Manton [Wed, 15 Jan 2020 00:34:08 +0000 (16:34 -0800)]
Initial entry for headless
Bug:
147316415
Test: Compiles and sdp test runs
Change-Id: I2db01df68fb8807ce934b59aab5a4f593d4f8074
Myles Watson [Fri, 17 Jan 2020 21:46:23 +0000 (13:46 -0800)]
Split ports for device and root-canal tests
Use 89xx ports for Root-canal tests and 88xx for device tests.
Bug:
148096951
Test: ./cert/run_device_cert.sh && ./cert/run_cert_facade_only.sh
Change-Id: I4ad9357d882668058450b42473addb69a290e7f5
Automerger Merge Worker [Tue, 21 Jan 2020 20:27:24 +0000 (20:27 +0000)]
Merge "ACL packet recombination" am:
3102f77de0 am:
e80ee98a4a
Change-Id: I25f06e4a08cb7e82995b87d77df4f2f28b09f91f
Hansong Zhang [Tue, 21 Jan 2020 20:19:54 +0000 (12:19 -0800)]
Merge "ACL packet recombination"
am:
3102f77de0
Change-Id: I69757b56781e026071ef20727f2a38c7869af464
Treehugger Robot [Tue, 21 Jan 2020 20:08:55 +0000 (20:08 +0000)]
Merge "ACL packet recombination"
Hansong Zhang [Thu, 16 Jan 2020 22:05:41 +0000 (14:05 -0800)]
ACL packet recombination
Recombine ACL fragments according to indicated L2CAP PDU size. Used the
workaround that rootcanal always sends the same ACL packet to remote to
verify.
Also added ACL fragmentation support in rootcanal. Recombination in
rootcanal is not supported so far, so whenever we want to send an ACL
packet fragment, we never buffer it until we have a complete L2CAP PDU.
Test: cert/run_cert_facade_only.sh run_cert.sh
Change-Id: Ieb4d3c987327867a39ce210474b84645175b8984
Automerger Merge Worker [Mon, 20 Jan 2020 21:11:33 +0000 (21:11 +0000)]
Fix legacy shim namespace am:
b22d23d374 am:
353cff16d0
Change-Id: I1d02e3c17e5a651b7e7398e47caf346485624670
Automerger Merge Worker [Mon, 20 Jan 2020 21:11:22 +0000 (21:11 +0000)]
Refactor dumpsys apis for legacy and gd am:
ff7ffd09fc am:
94d4e2cb7d
Change-Id: Ib1b5df714a6e23b23eb3285be646528ae1e25ab0
Chris Manton [Mon, 20 Jan 2020 20:57:13 +0000 (12:57 -0800)]
Fix legacy shim namespace
am:
b22d23d374
Change-Id: If665f563587efc22f604b96d3f6deac63bd74940
Chris Manton [Mon, 20 Jan 2020 20:56:34 +0000 (12:56 -0800)]
Refactor dumpsys apis for legacy and gd
am:
ff7ffd09fc
Change-Id: I6a3b86f56711cef4748ae5130d2a280149a60b2f
Chris Manton [Sun, 19 Jan 2020 01:29:38 +0000 (17:29 -0800)]
Fix legacy shim namespace
Align namespaces to adhere to convention
Bug:
140421732
Test: Builds
Change-Id: I23e716f7250b79d147ba0db974b91578ebf63d56
Chris Manton [Sat, 18 Jan 2020 03:25:36 +0000 (19:25 -0800)]
Refactor dumpsys apis for legacy and gd
Unify legacy and gd dumpsys syntax.
Fix static initialization order problem.
Bug:
147672133
Test: bt_headless and bluetooth_test_gd
Change-Id: I6f4d0d2c5611deace5a2a11eff8001b624b3dc62
Automerger Merge Worker [Sat, 18 Jan 2020 00:04:41 +0000 (00:04 +0000)]
Merge "Shim stack facade test and fix for test" am:
18162fbdc1 am:
faa47c7701
Change-Id: I5db18a8ea1cbd4641cc7ad6761b8a98a6b40e20c
Chris Manton [Fri, 17 Jan 2020 23:52:06 +0000 (15:52 -0800)]
Merge "Shim stack facade test and fix for test"
am:
18162fbdc1
Change-Id: Ic04bc30d0aa627eb7074e4089d61b0e7e72a7c50
Treehugger Robot [Fri, 17 Jan 2020 23:48:27 +0000 (23:48 +0000)]
Merge "Shim stack facade test and fix for test"
Automerger Merge Worker [Fri, 17 Jan 2020 23:38:10 +0000 (23:38 +0000)]
Merge "Fix issue around Encryption during Pairing" am:
7a62e2814c am:
e166d9901b
Change-Id: Iaa216f51abb42fcf5123b16fdde7b50d0d784c1e
Jakub Pawlowski [Fri, 17 Jan 2020 23:23:44 +0000 (15:23 -0800)]
Merge "Fix issue around Encryption during Pairing"
am:
7a62e2814c
Change-Id: I93c00c88e047eb2947ec92bff6392c7b693f065b
Treehugger Robot [Fri, 17 Jan 2020 23:07:49 +0000 (23:07 +0000)]
Merge "Fix issue around Encryption during Pairing"
Chris Manton [Fri, 17 Jan 2020 18:32:53 +0000 (10:32 -0800)]
Shim stack facade test and fix for test
Accidently 'captured' a raw pointer into a unique
pointer, which forced deletion upon destruction
resulting in other modules who rely on the no-longer-
in-existance module to call the module's pure
virtual Stop() function which is a bad thing.
Bug:
140778599
Test: ./gd/cert/run_cert_facade_only.sh
Change-Id: Ie1e39430517e47497172786fe4d8ab4976c371b4
Automerger Merge Worker [Fri, 17 Jan 2020 22:11:54 +0000 (22:11 +0000)]
Merge "Cert: Swap Cert and DUT for device tests" am:
12a6ff9be2 am:
05567c66ab
Change-Id: I58ae07be285793ada699ea5a5dea3e0c7d516543
Myles Watson [Fri, 17 Jan 2020 21:28:46 +0000 (13:28 -0800)]
Merge "Cert: Swap Cert and DUT for device tests"
am:
12a6ff9be2
Change-Id: I0656a250441cc1c53c32a929d1adcccdad8076ea
Treehugger Robot [Fri, 17 Jan 2020 18:59:33 +0000 (18:59 +0000)]
Merge "Cert: Swap Cert and DUT for device tests"
Jakub Pawlowski [Fri, 17 Jan 2020 18:54:47 +0000 (19:54 +0100)]
Fix issue around Encryption during Pairing
* ECC_PointMult erases private key argument, pass copy instead of
original value.
* Specify Z parameter for ECC Points
This fixes issues where LE Secure connection pairing between old and new
stack was failing due to DHKey mismatch
Test: manual pairing between phone running new and old stack
Bug:
147086339
Change-Id: Ied3404c2eb2ca55b717042ea099e1aefed1c3e8d
Myles Watson [Fri, 17 Jan 2020 17:33:26 +0000 (09:33 -0800)]
Cert: Check that child returns 0 or -signal
Bug:
147444951
Test: ./cert/run_device_cert.sh
Change-Id: I1628a039a90b6a389509afa28e59d1f23c622531
Automerger Merge Worker [Fri, 17 Jan 2020 17:03:27 +0000 (17:03 +0000)]
Merge "Hid: Fix connection issue with legacy mouse" am:
ab2c35908d am:
778ae7068e
Change-Id: Iaedcfe827f81c31e7578a689c9f47b8f2e69b689
OSDN Git Service
