git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

commit | commitdiff | tree

Martin Brabham [Mon, 15 Mar 2021 17:24:58 +0000 (17:24 +0000)]

Merge "IBluetoothManager: Update createBondOutOfBand interface" into sc-dev

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Mar 2021 05:48:57 +0000 (05:48 +0000)]

Merge changes Ia06fbdda,I08306608,I8e43aee4 am: d78d569d2f am: 7b07a11b31 am: 94a4c7d0f2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1633701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id341275ac736d4993a8b3763a8e92950419229ec

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Mar 2021 05:07:02 +0000 (05:07 +0000)]

Merge changes Ia06fbdda,I08306608,I8e43aee4 am: d78d569d2f am: 7b07a11b31

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1633701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f93b3cb780ca3cec21765e2bc03068e79cce40b

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Mar 2021 04:45:39 +0000 (04:45 +0000)]

Merge changes Ia06fbdda,I08306608,I8e43aee4 am: d78d569d2f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1633701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b6164c985ec0cb9ec23202e02de1a1b4f6ee72e

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Mar 2021 04:21:44 +0000 (04:21 +0000)]

Merge changes Ia06fbdda,I08306608,I8e43aee4

* changes:
  HCI: Use 0x0123 for hex
  HCI: Add more PDL tests
  Only pad the previous field

commit | commitdiff | tree

Chris Manton [Sat, 13 Mar 2021 01:28:52 +0000 (01:28 +0000)]

Log command status error conditions am: c41c785dcd am: 67e545b1c9 am: 850064d205

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1632938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e06439d018e08fc7e457953b0213d7bc3206b6e

commit | commitdiff | tree

Chris Manton [Sat, 13 Mar 2021 00:44:14 +0000 (00:44 +0000)]

Log command status error conditions am: c41c785dcd am: 67e545b1c9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1632938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754f7b524dc69104b5484bc93212b091a186512d

commit | commitdiff | tree

Chris Manton [Sat, 13 Mar 2021 00:25:54 +0000 (00:25 +0000)]

Log command status error conditions am: c41c785dcd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1632938

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabd70080fdf948897896f9ac882afe5be7175722

commit | commitdiff | tree

Chris Manton [Fri, 12 Mar 2021 03:01:53 +0000 (19:01 -0800)]

Log command status error conditions

Bug: 182524282
Test: Manual verification on failing scenario
Tag: #refactor
Change-Id: Ia76e97648c8091e2bde5a26b307d2779c21e6640

commit | commitdiff | tree

Myles Watson [Fri, 12 Mar 2021 18:54:39 +0000 (18:54 +0000)]

Merge changes I389b26d7,I0a668115,I75ef0b5c am: 76b4ccafa4 am: 288634f970 am: 7b042be169

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08ff60320111de42bd40acc3a9759b8e1babb96d

commit | commitdiff | tree

Myles Watson [Fri, 12 Mar 2021 05:44:08 +0000 (21:44 -0800)]

HCI: Use 0x0123 for hex

Bug: 182216573
Test: atest bluetooth_test_gd
libbt_packets_test
Tag: #gd-refactor
Change-Id: Ia06fbdda9101b77204c6ee3ba1c8c1edc81aa3bf

commit | commitdiff | tree

Myles Watson [Thu, 11 Mar 2021 21:10:23 +0000 (13:10 -0800)]

HCI: Add more PDL tests

Bug: 182216573
Test: atest bluetooth_test_gd
libbt_packets_test
Tag: #gd-refactor
Change-Id: I083066083a519c19a8d5c3a4928b306e2495c512

commit | commitdiff | tree

Myles Watson [Thu, 11 Mar 2021 18:05:47 +0000 (10:05 -0800)]

Only pad the previous field

Bug: 182216573
Test: atest bluetooth_test_gd
libbt_packets_test
bluetooth_packet_parser_test
Tag: #gd-refactor
Change-Id: I8e43aee420be58af81cd9f47fcf53a566af1b3fa

commit | commitdiff | tree

Myles Watson [Fri, 12 Mar 2021 18:11:52 +0000 (18:11 +0000)]

Merge changes I389b26d7,I0a668115,I75ef0b5c am: 76b4ccafa4 am: 288634f970

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16760db63061dd4452f6447d5cca322ddc10dcc3

commit | commitdiff | tree

Myles Watson [Fri, 12 Mar 2021 17:33:15 +0000 (17:33 +0000)]

Merge changes I389b26d7,I0a668115,I75ef0b5c am: 76b4ccafa4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib629a94db4a8747a111dac22042ed4f059d067f3

commit | commitdiff | tree

Myles Watson [Fri, 12 Mar 2021 17:12:01 +0000 (17:12 +0000)]

Merge changes I389b26d7,I0a668115,I75ef0b5c

* changes:
  Alias iterator in packet-gen
  Use generic type for JsonParser
  Change dynamic_cast to static_cast

commit | commitdiff | tree

Erwin Jansen [Thu, 11 Mar 2021 22:53:15 +0000 (14:53 -0800)]

Alias iterator in packet-gen

The msvc compiler is unable to translate some of the generated code:

error: no viable conversion from 'std::array<uint8_t, 248>::iterator'
(aka '_Array_iterator<unsigned char, 248ULL>') to 'uint8_t *' (aka
'unsigned char *')

Instead of assigning the value to a ptr, we alias the iterator instead.

Test: atest bluetooth_test_gd
Tag: #gd-refactor
Bug: 182505215
Change-Id: I389b26d71ef5bd8f96ae819d34ce11590f14a5e6

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 04:39:22 +0000 (04:39 +0000)]

Merge "PDL: For the Rust test, clone structs" am: 0ff14b0f8e am: e74ccde185 am: e32a4c8ce6

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3de4c124c7749d340489fd6bc30abd0db8c3475

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 04:38:44 +0000 (04:38 +0000)]

Merge changes I86da8ca8,Ibb58fae9,I9c6a9fa3,I4d1ab599,I818c0f4a, ... am: f0b7aa6473 am: 050937653e am: d480ad638a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1613068

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66594d0581f90d1419ee3396570d5f6a75421a12

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 03:52:36 +0000 (03:52 +0000)]

Merge "PDL: For the Rust test, clone structs" am: 0ff14b0f8e am: e74ccde185

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cda9b6bf9779161b9fe256e97805ac0e37aff3a

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 03:52:20 +0000 (03:52 +0000)]

Merge changes I86da8ca8,Ibb58fae9,I9c6a9fa3,I4d1ab599,I818c0f4a, ... am: f0b7aa6473 am: 050937653e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1613068

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67ab3892209b6cd0ffb56c0baa48e0fac1cf0c51

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 03:11:15 +0000 (03:11 +0000)]

Merge "PDL: For the Rust test, clone structs" am: 0ff14b0f8e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie97cca5d430ff3aa57d7e72f7ad7345547f55e22

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 02:51:43 +0000 (02:51 +0000)]

Merge "PDL: For the Rust test, clone structs"

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 02:47:56 +0000 (02:47 +0000)]

Merge changes I86da8ca8,Ibb58fae9,I9c6a9fa3,I4d1ab599,I818c0f4a, ... am: f0b7aa6473

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1613068

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c39fc9d204633b8d7a5437953e7e28b4f6d6739

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 02:19:33 +0000 (02:19 +0000)]

Merge changes I86da8ca8,Ibb58fae9,I9c6a9fa3,I4d1ab599,I818c0f4a, ...

* changes:
  Change libbt-platform-protos dependency
  Update the readme to use build.py and explain Rust
  Add build.py to simplify building locally
  Build support for Rust via Cargo
  Add option to build libbluetooth as staticlib
  Prevent building some codecs when not supported
  Build support and abstractions for Linux build
  Add source_root parameter to bluetooth_packetgen
  Fix bison 3.7 incompatability
  Host tools support

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 00:49:10 +0000 (00:49 +0000)]

Merge "HCI PDL: Fix formatting with spaces" am: bbcee0582f am: ebe72b66d2 am: dd2de4f058

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629061

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d6ff5f91979223fdbfd3e53b89fea720ad695a6

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Mar 2021 00:04:46 +0000 (00:04 +0000)]

Merge "HCI PDL: Fix formatting with spaces" am: bbcee0582f am: ebe72b66d2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629061

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6b7d8b8f2159d9d7c3a7abc6bcf6b4b6821624d

commit | commitdiff | tree

Jizheng Chu [Thu, 11 Mar 2021 23:41:24 +0000 (23:41 +0000)]

Merge "Unbind cert_self_test from ACTS" am: b98ae0fcc1 am: 780f588c44 am: 587eca9316

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I749caffcdc755d9c5ba462c5e885bb6fef702208

commit | commitdiff | tree

Chienyuan [Thu, 11 Mar 2021 23:41:14 +0000 (23:41 +0000)]

Shim Scanning: Update address type and device type to storage am: 2d7a4e404b am: 6f7a12f386 am: 080f4314db

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f8843b1f1fb7b29a65f955532e01b7f11304da4

commit | commitdiff | tree

Treehugger Robot [Thu, 11 Mar 2021 23:14:19 +0000 (23:14 +0000)]

Merge "HCI PDL: Fix formatting with spaces" am: bbcee0582f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1629061

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88b78ae4bc92386dd028677f1d9b414d52df21d0

commit | commitdiff | tree

Jizheng Chu [Thu, 11 Mar 2021 22:55:21 +0000 (22:55 +0000)]

Merge "Unbind cert_self_test from ACTS" am: b98ae0fcc1 am: 780f588c44

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f1ba1633c85143d14f8edd231c51736b217398c

commit | commitdiff | tree

Chienyuan [Thu, 11 Mar 2021 22:55:08 +0000 (22:55 +0000)]

Shim Scanning: Update address type and device type to storage am: 2d7a4e404b am: 6f7a12f386

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic85fe8d1398b6a96553489821fbf948231ac730e

commit | commitdiff | tree

Treehugger Robot [Thu, 11 Mar 2021 22:53:00 +0000 (22:53 +0000)]

Merge "HCI PDL: Fix formatting with spaces"

commit | commitdiff | tree

Jizheng Chu [Thu, 11 Mar 2021 22:23:14 +0000 (22:23 +0000)]

Merge "Unbind cert_self_test from ACTS" am: b98ae0fcc1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b4be44a167319cfa2c9deb6f4e3fe81194fb67

commit | commitdiff | tree

Chienyuan [Thu, 11 Mar 2021 22:21:55 +0000 (22:21 +0000)]

Shim Scanning: Update address type and device type to storage am: 2d7a4e404b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c81a579e9c72e5315bbbf249bd0ebec2ecef87b

commit | commitdiff | tree

Jizheng Chu [Thu, 11 Mar 2021 21:42:47 +0000 (21:42 +0000)]

Merge "Unbind cert_self_test from ACTS"

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 23:44:43 +0000 (15:44 -0800)]

PDL: For the Rust test, clone structs

Bug: 182216573
Test: atest bluetooth_test_gd
libbt_packets_test
Tag: #gd-refactor
Change-Id: Id3e8ddca497fb0014bfcac1c96b465dede4c6995

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 21:57:18 +0000 (13:57 -0800)]

HCI PDL: Fix formatting with spaces

Bug: 182216573
Test: atest bluetooth_test_gd
libbt_packets_test
Tag: #gd-refactor
Change-Id: Ifd4d681fe95664cec639bab800bec73c26b1d3a4

commit | commitdiff | tree

Erwin Jansen [Thu, 11 Mar 2021 17:42:20 +0000 (09:42 -0800)]

Use generic type for JsonParser

The android emulator team uses a newer libchrome library. The json read
method now returns an Optional type, vs. a unique_ptr.

We now let the compiler infer the type and rely on the operators to do
the right thing.

Change-Id: I0a668115659d6508344190783b7dc55d84374f15
Test: System compiles.
Bug: 182487647

commit | commitdiff | tree

Erwin Jansen [Sun, 7 Mar 2021 21:01:06 +0000 (13:01 -0800)]

Change dynamic_cast to static_cast

dynamic_cast requires type information at run time to throw exceptions.
This is not available in the emulator build system, where execeptions
are explicitly disabled.

Instead we use static_cast to downcast.

Change-Id: I75ef0b5c694320fc1e9fe648e8087e4def8cdf94
Test: Build succeeds.

commit | commitdiff | tree

Chienyuan [Thu, 11 Mar 2021 11:39:08 +0000 (19:39 +0800)]

Shim Scanning: Update address type and device type to storage

Tag: #gd-refactor
Bug: 182243613
Test: gd/cert/run
Test: manual, pair LE device with public address
Change-Id: I8a9a0873dbdf4e8fd85f12ae7f0b2d911f5a47dc

commit | commitdiff | tree

Martin Brabham [Thu, 21 Jan 2021 18:37:43 +0000 (10:37 -0800)]

IBluetoothManager: Update createBondOutOfBand interface

Add plumbing for both p192 and p256 data types.

Ignore-AOSP-First: Conflicts with CL previously merged internal
Bug: 178007935
Test: atest net_test_btif
Tag: #refactor
Change-Id: I6b1424c22495821bfbbf56830f3848e6c03b74d4

commit | commitdiff | tree

Qasim Javed [Thu, 11 Mar 2021 03:42:01 +0000 (03:42 +0000)]

Merge "rusty-gd: Use a sequenced runner to post closures." am: d8a0789c9f am: 33c672bdf4 am: 67bcaf731d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I205b8c1780a4fa2702e8afab559441821b5b6d50

commit | commitdiff | tree

Hansong Zhang [Thu, 11 Mar 2021 03:41:05 +0000 (03:41 +0000)]

GD: Open a pid file when stack is running am: 29f06a0604 am: 6df0dfc8f0 am: 68a5a16424

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08dca1b2b9ff8dab7865969587917fb7456a02e0

commit | commitdiff | tree

Qasim Javed [Thu, 11 Mar 2021 03:18:31 +0000 (03:18 +0000)]

Merge "rusty-gd: Use a sequenced runner to post closures." am: d8a0789c9f am: 33c672bdf4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I691505521f8c436259489e757da9e4c25a1abda4

commit | commitdiff | tree

Hansong Zhang [Thu, 11 Mar 2021 03:17:43 +0000 (03:17 +0000)]

GD: Open a pid file when stack is running am: 29f06a0604 am: 6df0dfc8f0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6d959184118333296a04df7964eab4b2b62efc2

commit | commitdiff | tree

Qasim Javed [Thu, 11 Mar 2021 02:50:27 +0000 (02:50 +0000)]

Merge "rusty-gd: Use a sequenced runner to post closures." am: d8a0789c9f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1626979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7af376c6654c4cbff1765b2e784f289e2f6aa28

commit | commitdiff | tree

Hansong Zhang [Thu, 11 Mar 2021 02:41:42 +0000 (02:41 +0000)]

GD: Open a pid file when stack is running am: 29f06a0604

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie78420369dc9de586182f8a5196adcb8c7bcff2f

commit | commitdiff | tree

Qasim Javed [Thu, 11 Mar 2021 01:59:20 +0000 (01:59 +0000)]

Merge "rusty-gd: Use a sequenced runner to post closures."

commit | commitdiff | tree

Hansong Zhang [Thu, 4 Mar 2021 02:08:42 +0000 (18:08 -0800)]

GD: Open a pid file when stack is running

So that some other manager process can detect it

Test: cert/run
Bug: 181590011
Tag: #refactor
Change-Id: I340b5d25b4374d47c8c769d80fcd287b23696202

commit | commitdiff | tree

Qasim Javed [Tue, 9 Mar 2021 21:30:01 +0000 (13:30 -0800)]

rusty-gd: Use a sequenced runner to post closures.

With this, I am able to reconnect to Pixel Buds successfully.

Previously, there was a crash due CHECK(ThreadTaskRunner::IsSet())
failing.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest

Change-Id: I43ad40b03a63bdec5284c584216671bd3ae20376

commit | commitdiff | tree

Weichin Weng [Wed, 10 Mar 2021 05:17:21 +0000 (05:17 +0000)]

Merge "Remove log.h from mock file" am: 8a65a1b9eb am: 4be1b39999 am: 0202f636f2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib14782c0c207c3fec87a96e5f6b1642e38e2289b

commit | commitdiff | tree

weichinweng [Wed, 10 Mar 2021 05:17:18 +0000 (05:17 +0000)]

Move Common Criteria mode dependency to Android only. am: 5bfacc5f8c am: 16fc963555 am: 97c2f88183

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab3a99fe25520f1296bda341e4275078dfba4876

commit | commitdiff | tree

Weichin Weng [Wed, 10 Mar 2021 04:31:00 +0000 (04:31 +0000)]

Merge "Remove log.h from mock file" am: 8a65a1b9eb am: 4be1b39999

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92cf53b70469301dda2da2b14d2b2b66fb63724a

commit | commitdiff | tree

weichinweng [Wed, 10 Mar 2021 04:30:57 +0000 (04:30 +0000)]

Move Common Criteria mode dependency to Android only. am: 5bfacc5f8c am: 16fc963555

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0cb85bd38944980daf2093e4589f456b8ea87b0

commit | commitdiff | tree

Weichin Weng [Wed, 10 Mar 2021 02:35:21 +0000 (02:35 +0000)]

Merge "Remove log.h from mock file" am: 8a65a1b9eb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4420b75a2b1777877b23630da4872f06cfa2347

commit | commitdiff | tree

weichinweng [Wed, 10 Mar 2021 02:34:30 +0000 (02:34 +0000)]

Move Common Criteria mode dependency to Android only. am: 5bfacc5f8c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1614945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2339d457d2c098349cd6835b7b1b1fea6aa83051

commit | commitdiff | tree

Weichin Weng [Wed, 10 Mar 2021 02:04:26 +0000 (02:04 +0000)]

Merge "Remove log.h from mock file"

commit | commitdiff | tree

weichinweng [Fri, 5 Mar 2021 06:12:09 +0000 (14:12 +0800)]

Move Common Criteria mode dependency to Android only.

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I92deb21350f9ec963d7d5985aed31563b7384bbd

commit | commitdiff | tree

weichinweng [Mon, 8 Mar 2021 12:08:30 +0000 (20:08 +0800)]

Remove log.h from mock file

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I89356bb39fa0fe5cc70d8ee17a28699275a32126

commit | commitdiff | tree

JaeMan Park [Wed, 10 Mar 2021 01:51:06 +0000 (01:51 +0000)]

Merge "Fix handshaking error between HCI driver and rootcanal" am: 82acd1a392 am: 3ffae7f198 am: 2b47476319

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1597483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id995b226a66171fc8a66e36ebb34bad8334bd81b

commit | commitdiff | tree

JaeMan Park [Wed, 10 Mar 2021 01:07:57 +0000 (01:07 +0000)]

Merge "Fix handshaking error between HCI driver and rootcanal" am: 82acd1a392 am: 3ffae7f198

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1597483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ecf9f7c21bf9750f3973d07b58456373f3b3087

commit | commitdiff | tree

JaeMan Park [Wed, 10 Mar 2021 00:49:08 +0000 (00:49 +0000)]

Merge "Fix handshaking error between HCI driver and rootcanal" am: 82acd1a392

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1597483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If921000ab7e534ada5e8c16a03f822dc9b1ec277

commit | commitdiff | tree

JaeMan Park [Wed, 10 Mar 2021 00:04:51 +0000 (00:04 +0000)]

Merge "Fix handshaking error between HCI driver and rootcanal"

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 23:28:00 +0000 (23:28 +0000)]

Merge "Revert "Put stack vars in proper scope"" am: ff6d325cda am: 4d3b4f9391 am: 2fa8f48ec2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1625079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic93ac95fb68b76c617f61a2932a850dcea3c013d

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 23:27:47 +0000 (23:27 +0000)]

Merge changes I40975081,Ia1fe07b4,Ieffc9874 am: bfae0fd73a am: f29f93f334 am: 547379d80a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622930

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice9e41d2f1bb4b9814afb0745818652977b58a93

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 23:05:36 +0000 (23:05 +0000)]

Merge "Revert "Put stack vars in proper scope"" am: ff6d325cda am: 4d3b4f9391

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1625079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac5b4d1e1bb68012b70fa33e91e2c463efe14072

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 23:05:25 +0000 (23:05 +0000)]

Merge changes I40975081,Ia1fe07b4,Ieffc9874 am: bfae0fd73a am: f29f93f334

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622930

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibecaf8d8807c0c5dcb0983c2a0a2c691a8e7a60b

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 22:29:21 +0000 (22:29 +0000)]

Merge "Revert "Put stack vars in proper scope"" am: ff6d325cda

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1625079

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0721a85ab199a761050dd2f90cdaf5ad1d943022

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 22:28:09 +0000 (22:28 +0000)]

Merge changes I40975081,Ia1fe07b4,Ieffc9874 am: bfae0fd73a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1622930

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6689f62921bae025008683958545ea7fd1c79cb

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 22:13:27 +0000 (22:13 +0000)]

Merge "Revert "Put stack vars in proper scope""

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 22:08:18 +0000 (22:08 +0000)]

Merge changes I40975081,Ia1fe07b4,Ieffc9874

* changes:
  PDL: Add example test packets
  Rust: Add a packet test
  PDL: Add support for test

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 20:36:21 +0000 (12:36 -0800)]

Revert "Put stack vars in proper scope"

Bug: 182259591
Test: Builds and compiles
Tag: #refactor

This reverts commit 3318a1ce16a4fdb3d7a2c4bfc4e9dfe407839d3f.

Change-Id: I25771c2c40089fc46ebce256c0ae1344ac6af2c4

commit | commitdiff | tree

Jeongik Cha [Tue, 9 Mar 2021 16:26:53 +0000 (16:26 +0000)]

Send response as combined form am: 1a93288cf4 am: 242946f1c6 am: a965c1fabf

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1623699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b10f539696138919b9e8edeaf5785a971e2fa4

commit | commitdiff | tree

Jeongik Cha [Tue, 9 Mar 2021 15:45:22 +0000 (15:45 +0000)]

Send response as combined form am: 1a93288cf4 am: 242946f1c6

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1623699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bfe7daa2b69725acf9b34af0aacef93d27c44ba

commit | commitdiff | tree

Jeongik Cha [Tue, 9 Mar 2021 15:04:13 +0000 (15:04 +0000)]

Send response as combined form am: 1a93288cf4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1623699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdd41315914d4e230911217ecaec729e90853241

commit | commitdiff | tree

Jeongik Cha [Tue, 9 Mar 2021 05:41:07 +0000 (14:41 +0900)]

Send response as combined form

As-is: root-canal's response consists of packet type and payload
separately

In the case of several request in parallel, the responses could be
overlapped, so make it combined to avoid the situation.

Test: atest AdapterServiceTest
Bug: 182167189
Change-Id: I19b99f6399777e927b81c26366d8e02ae577936e

commit | commitdiff | tree

Chen Chen [Tue, 9 Mar 2021 04:13:25 +0000 (04:13 +0000)]

Merge "Add metric_id_manager to GD using existing Address and LruCache of GD" am: c6eb363d17 am: 99f0955828 am: b722f800e1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1619844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf02ffe7649e6af510e6e25baab4e61350b43ced

commit | commitdiff | tree

Chen Chen [Tue, 9 Mar 2021 03:23:29 +0000 (03:23 +0000)]

Merge "Add metric_id_manager to GD using existing Address and LruCache of GD" am: c6eb363d17 am: 99f0955828

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1619844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie56214d92e88c2bb38ad6e6322ab0225daa69804

commit | commitdiff | tree

Chen Chen [Tue, 9 Mar 2021 02:37:23 +0000 (02:37 +0000)]

Merge "Add metric_id_manager to GD using existing Address and LruCache of GD" am: c6eb363d17

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1619844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I538bc191faabe9d7c38d46d1c7b15a3cfe372753

commit | commitdiff | tree

Chen Chen [Tue, 9 Mar 2021 01:58:42 +0000 (01:58 +0000)]

Merge "Add metric_id_manager to GD using existing Address and LruCache of GD"

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 00:38:57 +0000 (16:38 -0800)]

PDL: Add example test packets

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: I40975081d5d30f7078a432df94b9d0c58410da97

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 00:37:55 +0000 (16:37 -0800)]

Rust: Add a packet test

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: Ia1fe07b49363b166d164811dd9aaceea05e66d48

commit | commitdiff | tree

Myles Watson [Tue, 9 Mar 2021 00:51:50 +0000 (16:51 -0800)]

PDL: Add support for test

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: Ieffc9874c0ff17cb2a0acb5e9399b6222f585f7c

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 01:20:23 +0000 (01:20 +0000)]

Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am: 28e8caaba8 am: 74be1cc019 am: c610576dd4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1621332

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If260fbfff8fdad71a1ec8b273e914c9d47f19c40

commit | commitdiff | tree

Hansong Zhang [Tue, 9 Mar 2021 01:20:10 +0000 (01:20 +0000)]

Add a way to connect to linux raw HCI HAL am: 6453e4a8e3 am: cfb5a06e1d am: d193dca592

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9784cc29b5b322608f5879fbe592a269a941f0e

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 00:56:20 +0000 (00:56 +0000)]

Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am: 28e8caaba8 am: 74be1cc019

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1621332

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbcb10dd69f85428d03c12fa50991f2358cb1066

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 00:41:51 +0000 (00:41 +0000)]

Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am: 28e8caaba8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1621332

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I989c6bef6cf54667e59f9060e2a53455c5caffde

commit | commitdiff | tree

Hansong Zhang [Tue, 9 Mar 2021 00:38:26 +0000 (00:38 +0000)]

Add a way to connect to linux raw HCI HAL am: 6453e4a8e3 am: cfb5a06e1d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8053d69b08a1e3f2e47c3a45842199198c0c4f21

commit | commitdiff | tree

Chris Manton [Tue, 9 Mar 2021 00:19:34 +0000 (00:19 +0000)]

Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ...

* changes:
  Introduce main_shim_test
  Add main/test::shim mocks
  Add gd/neighbor::inquiry mock
  Add SCO HACK for shim acl mock
  Add gd/hci::controller mock
  gd_acl: Directly access acl manager for SCO hack
  Put stack vars in proper scope
  Return proper type stack/acl/btm_pm::BTM_SetPowerMode
  Explicitly specify status type include/hardware/ble_scanner.h
  Add stack init indirection for activity_attribution
  Use proper tBTM_STATUS types
  Use tBTM_STATUS in stack/l2cap/::
  gd_shim: Log more info about acl queue state
  Add bta_sys post to main alternative method
  Remove unused field srvc_id
  Template prep for bta hardening
  Use btm_status in stack/rfcomm/::
  Use proper types tBLE_SCAN_MODE
  User proper types tBTM_STATUS
  Canonicalize tBTM_APPL_INFO::bta_security
  Streamline bta_av_link_role_ok
  Use canonical include paths
  Add hci code conversion stack/include/hci_error_code
  Remove unused bta/include/bta_api::#defs
  Remove unused API BTM_GetPeerSCA
  Remove unused API BTM_RequestPeerSCA
  Remove unused API BTM_IsPhy2mSupported
  Properly conform tACL_CONN field names
  Add stack/include::BT_HDR rigid struct
  Use proper types tSMP_STATUS
  Properly type stack/smp::tSMP_EVT
  Remove useless extern keyword for definitions
  Remove unused stack/gatt/gatt_int::#defs
  Re-include bta/ag/bta_ag_sdp.cc

commit | commitdiff | tree

Hansong Zhang [Mon, 8 Mar 2021 23:57:24 +0000 (23:57 +0000)]

Add a way to connect to linux raw HCI HAL am: 6453e4a8e3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1617700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I057fa24bc1560f60ee8d6281278870a6ba5601e5

commit | commitdiff | tree

Hansong Zhang [Wed, 3 Mar 2021 23:55:37 +0000 (15:55 -0800)]

Add a way to connect to linux raw HCI HAL

Tag: #refactor
Bug: 181590011
Test: cert/run
Change-Id: I5308fd604b091392b9a8b15154732afeb03dde57

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 20:25:19 +0000 (12:25 -0800)]

Introduce main_shim_test

Bug: 181991662
Test: gd/cert/run
Tag: #refactor

Change-Id: Ib81960bb3065f3964be16ba0feaf22358be8f323

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 02:53:07 +0000 (18:53 -0800)]

Add main/test::shim mocks

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
No-Typo-Check: Legacy misnamed code

Change-Id: I1d84f463fe1a126f1cc685b10f77f4872088a78d

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 02:52:31 +0000 (18:52 -0800)]

Add gd/neighbor::inquiry mock

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Id475e31092c884b33bd92b4ee18ff53b7c4d4a03

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 22:47:01 +0000 (14:47 -0800)]

Add SCO HACK for shim acl mock

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
Change-Id: I4ba9755c6f482c99bbbc0bd55de22d45d8949815

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 02:52:21 +0000 (18:52 -0800)]

Add gd/hci::controller mock

Bug: 181991662
Test: cert
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib6f7b4bada0ae673842f134dc5eb22d9b2bf422d

commit | commitdiff | tree

Chris Manton [Fri, 5 Mar 2021 16:35:18 +0000 (08:35 -0800)]

gd_acl: Directly access acl manager for SCO hack

Also explicitly log SCO disconnect

Bug: 179649871
Test: gd/cert/run
Tag: #refactor

Change-Id: Ia8fb5408d909c02d01bac5057dd388e1d8909e63

commit | commitdiff | tree

Chris Manton [Wed, 3 Mar 2021 01:03:12 +0000 (17:03 -0800)]

Put stack vars in proper scope

Toward refactor-able code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ied75ac91e075d9072875b34f91d91c1191473215

commit | commitdiff | tree

Chris Manton [Mon, 1 Mar 2021 18:34:01 +0000 (10:34 -0800)]

Return proper type stack/acl/btm_pm::BTM_SetPowerMode

Toward type safe code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ifdd3fcbd0c149f5d5a8987f6e0a15210d8a6cdc8

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help