OSDN Git Service

android-x86/system-bt.git
3 years agoUpdate Bluetooth API annotations.
Jeff Sharkey [Fri, 9 Apr 2021 21:10:23 +0000 (15:10 -0600)]
Update Bluetooth API annotations.

Recent work has introduced a new "Nearby devices" runtime permission
which protects all existing Bluetooth APIs; we've done this by
defining a <split-permission> to convert the old BLUETOOTH and
BLUETOOTH_ADMIN permissions into one of three new permissions:

* BLUETOOTH_ADVERTISE: Required to be able to advertise to nearby
                       Bluetooth devices.
* BLUETOOTH_CONNECT:   Allows applications to connect to paired
                       bluetooth devices.
* BLUETOOTH_SCAN:      Required to be able to discover and pair
                       nearby Bluetooth devices.

At its core, this change begins updating the Bluetooth APIs to have
correct @RequiresPermission indicating which permission is actually
enforced internally.  To ensure alignment across Binder, the newly
added "RequiresPermissionChecker" Error Prone checker was used to
discover any inconsistencies, ensuring correctness from server-side
enforcement up through to the public APIs.

In addition, since developers will continue building apps for both
modern and legacy platforms, this change introduces new auto-doc
annotations which will emit helpful consistent documentation
describing the behavior of older devices that are still using the
old permission model.

Bug: 183626724
Test: ./build/soong/soong_ui.bash --make-mode Bluetooth RUN_ERROR_PRONE=true
Change-Id: I16880d3f8edee8123cb512a9d8898ceccbe576f3

3 years agogd: Enforce modules to present a unique name am: fb7add516e am: ea9b236ca3 am: babb36c484
Chris Manton [Wed, 14 Apr 2021 22:53:43 +0000 (22:53 +0000)]
gd: Enforce modules to present a unique name am: fb7add516e am: ea9b236ca3 am: babb36c484

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

Change-Id: I5c18fd7f8713f3b068da99959aedfae6efdcc255

3 years agoheadless: Add docs and more information am: 916fb47ab0 am: 8e6199c3d1 am: 0ed7ead431
Chris Manton [Wed, 14 Apr 2021 22:53:42 +0000 (22:53 +0000)]
headless: Add docs and more information am: 916fb47ab0 am: 8e6199c3d1 am: 0ed7ead431

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

Change-Id: Ic49337074070a38300a8e936bf7fc3e2e3f4ec18

3 years agoheadless: Add initial/final sentinal log markers am: 8749c7eacf am: acd6441cf7 am...
Chris Manton [Wed, 14 Apr 2021 22:53:40 +0000 (22:53 +0000)]
headless: Add initial/final sentinal log markers am: 8749c7eacf am: acd6441cf7 am: 9c5c948b6d

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

Change-Id: I7502b0234405269b1caaee88e3ca0c25ea3853dc

3 years agoExplict default init types module_t am: db98e4b191 am: 3491ff5a4e am: c0952ccf5f
Chris Manton [Wed, 14 Apr 2021 22:53:39 +0000 (22:53 +0000)]
Explict default init types module_t am: db98e4b191 am: 3491ff5a4e am: c0952ccf5f

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

Change-Id: I9f36b63443aac490ca40aa58fc95e3e97c5db41f

3 years agoEnum-ify tSMP_EVT am: b7313a27d4 am: 7c3dbe9ee5 am: 2cf67bfeb6
Chris Manton [Wed, 14 Apr 2021 22:53:38 +0000 (22:53 +0000)]
Enum-ify tSMP_EVT am: b7313a27d4 am: 7c3dbe9ee5 am: 2cf67bfeb6

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

Change-Id: I93a0c0a32878d7ab2403379dca21771b68a7dc01

3 years agoEnum-ify tBTA_STATUS am: 0ee1b8b53f am: 3bbd0e1350 am: 2ef2e4e0f7
Chris Manton [Wed, 14 Apr 2021 22:53:36 +0000 (22:53 +0000)]
Enum-ify tBTA_STATUS am: 0ee1b8b53f am: 3bbd0e1350 am: 2ef2e4e0f7

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

Change-Id: I9c92c6d961668a628709478a6f335184d200b38e

3 years agotesting: Use proper types am: 37a7a9f0ea am: 439cc29838 am: 312f282672
Chris Manton [Wed, 14 Apr 2021 22:53:33 +0000 (22:53 +0000)]
testing: Use proper types am: 37a7a9f0ea am: 439cc29838 am: 312f282672

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

Change-Id: Ia4f968d122772846079d87e009124d4a2de6063e

3 years agogd: Enforce modules to present a unique name am: fb7add516e am: ea9b236ca3
Chris Manton [Wed, 14 Apr 2021 22:06:37 +0000 (22:06 +0000)]
gd: Enforce modules to present a unique name am: fb7add516e am: ea9b236ca3

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

Change-Id: I50f40ad16036385a24a4d86c3647311ff11c3f17

3 years agoheadless: Add docs and more information am: 916fb47ab0 am: 8e6199c3d1
Chris Manton [Wed, 14 Apr 2021 22:06:37 +0000 (22:06 +0000)]
headless: Add docs and more information am: 916fb47ab0 am: 8e6199c3d1

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

Change-Id: Ia25aa9a452e8352c39eb5e44005f4cbab3a698a5

3 years agoheadless: Add initial/final sentinal log markers am: 8749c7eacf am: acd6441cf7
Chris Manton [Wed, 14 Apr 2021 22:06:36 +0000 (22:06 +0000)]
headless: Add initial/final sentinal log markers am: 8749c7eacf am: acd6441cf7

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

Change-Id: I66d217fbb07c359e2efd9f5ab83c813f5b0d132e

3 years agoExplict default init types module_t am: db98e4b191 am: 3491ff5a4e
Chris Manton [Wed, 14 Apr 2021 22:06:35 +0000 (22:06 +0000)]
Explict default init types module_t am: db98e4b191 am: 3491ff5a4e

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

Change-Id: Ic7edd0bd927292af2d45e610fab022a905b0f0ea

3 years agoEnum-ify tSMP_EVT am: b7313a27d4 am: 7c3dbe9ee5
Chris Manton [Wed, 14 Apr 2021 22:06:34 +0000 (22:06 +0000)]
Enum-ify tSMP_EVT am: b7313a27d4 am: 7c3dbe9ee5

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

Change-Id: I3d28f3d9fb50299a0326d82d30bea2f41613e166

3 years agoEnum-ify tBTA_STATUS am: 0ee1b8b53f am: 3bbd0e1350
Chris Manton [Wed, 14 Apr 2021 22:06:34 +0000 (22:06 +0000)]
Enum-ify tBTA_STATUS am: 0ee1b8b53f am: 3bbd0e1350

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

Change-Id: I67872e6fd1fc10081dcba54915568542658f2b2d

3 years agotesting: Use proper types am: 37a7a9f0ea am: 439cc29838
Chris Manton [Wed, 14 Apr 2021 22:06:32 +0000 (22:06 +0000)]
testing: Use proper types am: 37a7a9f0ea am: 439cc29838

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

Change-Id: If777903d0811abd78f2715f3378fdefc4e56b550

3 years agogd: Enforce modules to present a unique name am: fb7add516e
Chris Manton [Wed, 14 Apr 2021 21:23:22 +0000 (21:23 +0000)]
gd: Enforce modules to present a unique name am: fb7add516e

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

Change-Id: Ia30755e98c07b0d4270367e1818d8c1da3b6977e

3 years agoheadless: Add docs and more information am: 916fb47ab0
Chris Manton [Wed, 14 Apr 2021 21:23:19 +0000 (21:23 +0000)]
headless: Add docs and more information am: 916fb47ab0

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

Change-Id: I8de903edb9dc959915fc976c0f036c3c54dc3255

3 years agoheadless: Add initial/final sentinal log markers am: 8749c7eacf
Chris Manton [Wed, 14 Apr 2021 21:23:17 +0000 (21:23 +0000)]
headless: Add initial/final sentinal log markers am: 8749c7eacf

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

Change-Id: If544f538cedc62dd3c57c5e9a6226d3cf7bf37e2

3 years agoExplict default init types module_t am: db98e4b191
Chris Manton [Wed, 14 Apr 2021 21:23:15 +0000 (21:23 +0000)]
Explict default init types module_t am: db98e4b191

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

Change-Id: I3e0a039a23949b89a4315fbeb5935ea9b7b29e0e

3 years agoEnum-ify tSMP_EVT am: b7313a27d4
Chris Manton [Wed, 14 Apr 2021 21:23:13 +0000 (21:23 +0000)]
Enum-ify tSMP_EVT am: b7313a27d4

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

Change-Id: I45a74da32b2c006c9d60fc3b92d92d9e5a59aa91

3 years agoEnum-ify tBTA_STATUS am: 0ee1b8b53f
Chris Manton [Wed, 14 Apr 2021 21:23:11 +0000 (21:23 +0000)]
Enum-ify tBTA_STATUS am: 0ee1b8b53f

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

Change-Id: I165ed90a19646e9a17e3d514525c5ccdefb10348

3 years agotesting: Use proper types am: 37a7a9f0ea
Chris Manton [Wed, 14 Apr 2021 21:22:23 +0000 (21:22 +0000)]
testing: Use proper types am: 37a7a9f0ea

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

Change-Id: I6e2e417f524e8697f593ff1b98e16964a9daeb6e

3 years agogd: Enforce modules to present a unique name
Chris Manton [Tue, 13 Apr 2021 23:49:18 +0000 (16:49 -0700)]
gd: Enforce modules to present a unique name

A rogue module should be identified if it hangs

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

Change-Id: I0514ff36c7b1654e8de30a262b9a3a05a305a537

3 years agoheadless: Add docs and more information
Chris Manton [Tue, 13 Apr 2021 23:49:51 +0000 (16:49 -0700)]
headless: Add docs and more information

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

Change-Id: I44c8a3a38914581a335446f975c9626a9587e73f

3 years agoheadless: Add initial/final sentinal log markers
Chris Manton [Tue, 13 Apr 2021 21:17:14 +0000 (14:17 -0700)]
headless: Add initial/final sentinal log markers

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

Change-Id: Ic965827c03487d9d7984382178411e520c5a5057

3 years agoExplict default init types module_t
Chris Manton [Sat, 10 Apr 2021 17:48:17 +0000 (10:48 -0700)]
Explict default init types module_t

Toward initialized code

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

Change-Id: I343a777b57138017f825823d260a3c956f2aead0

3 years agoEnum-ify tSMP_EVT
Chris Manton [Tue, 2 Mar 2021 20:32:59 +0000 (12:32 -0800)]
Enum-ify tSMP_EVT

Toward readable code

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

Change-Id: I12e2d8d7d1f8ddb05a6b9b673c74013fda5a0d22

3 years agoEnum-ify tBTA_STATUS
Chris Manton [Wed, 3 Mar 2021 01:02:17 +0000 (17:02 -0800)]
Enum-ify tBTA_STATUS

Toward readable code

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

Change-Id: Id79e619d24484ace55409e32f99368d5d9bce06e

3 years agotesting: Use proper types
Chris Manton [Wed, 14 Apr 2021 03:16:41 +0000 (20:16 -0700)]
testing: Use proper types

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I959e0522ca0e7394e7d1287859694d83d9e50e83

3 years ago[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef...
Bill Yi [Wed, 14 Apr 2021 07:16:31 +0000 (07:16 +0000)]
[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef8a -s ours am: 314efee24f -s ours am: 566d274a13 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I995d017caa8dcd6606d57cb2ff604277d986bd37

3 years ago[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef...
Bill Yi [Wed, 14 Apr 2021 06:31:20 +0000 (06:31 +0000)]
[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef8a -s ours am: 314efee24f -s ours

am skip reason: skip tag Change-Id Ia5ca732e8464d02a3c5a7b1b75f4c6afbe441fb1 with SHA-1 2e65a9a87e is already in history

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

Change-Id: I9c55d16f68ac58b32442b07ef2d29e4112b51968

3 years ago[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef...
Bill Yi [Wed, 14 Apr 2021 05:46:17 +0000 (05:46 +0000)]
[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 0e28b0ef8a -s ours

am skip reason: skip tag Change-Id Ia5ca732e8464d02a3c5a7b1b75f4c6afbe441fb1 with SHA-1 2e65a9a87e is already in history

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

Change-Id: Iefc5cbba7f48364a7f4a3965a6cdabb4caf4620f

3 years agoMerge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Bill Yi [Wed, 14 Apr 2021 02:29:21 +0000 (19:29 -0700)]
Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE

Merged-In: Ia5ca732e8464d02a3c5a7b1b75f4c6afbe441fb1
Merged-In: I4021d889879a11a7ad2a59a1b63c4371970cc823
Change-Id: I2db132a530a87a3664f7ea24c0fc5d4ac0a85822

3 years agoMerge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d am: 2e65a9...
Jack He [Wed, 14 Apr 2021 01:31:24 +0000 (01:31 +0000)]
Merge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d am: 2e65a9a87e am: 71bb68a06c

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

Change-Id: I7e357e60dadd913582ba110b3a17ea199602ffc6

3 years ago[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE...
Bill Yi [Wed, 14 Apr 2021 01:30:09 +0000 (01:30 +0000)]
[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: a6f8d31490 -s ours am: ee5922d4b0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4c3f1fff62c4033901c826bff6446d4e68d37c2a

3 years agoMerge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d am: 2e65a9a87e
Jack He [Wed, 14 Apr 2021 01:23:17 +0000 (01:23 +0000)]
Merge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d am: 2e65a9a87e

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

Change-Id: I4021d889879a11a7ad2a59a1b63c4371970cc823

3 years ago[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE...
Bill Yi [Wed, 14 Apr 2021 00:31:10 +0000 (00:31 +0000)]
[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: a6f8d31490 -s ours

am skip reason: skip tag Change-Id I269fdcdf301bb442f124a0813db066441ae2e29f with SHA-1 75e75f01bd is already in history

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

Change-Id: If46bb21a152a4ad3dfccb7cf2e8817db9d4fb047

3 years agoMerge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d
Jack He [Wed, 14 Apr 2021 00:28:50 +0000 (00:28 +0000)]
Merge "RFCOMM: Handle configuration for pending connection" am: 851fa54a0d

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

Change-Id: Ia5ca732e8464d02a3c5a7b1b75f4c6afbe441fb1

3 years agoMerge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp...
Bill Yi [Wed, 14 Apr 2021 00:27:06 +0000 (00:27 +0000)]
Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master

3 years agoMerge "RFCOMM: Handle configuration for pending connection"
Jack He [Tue, 13 Apr 2021 23:58:05 +0000 (23:58 +0000)]
Merge "RFCOMM: Handle configuration for pending connection"

3 years ago[automerger skipped] Merge "OOB: Implement generateLocalOobData API" am: 1efb039447...
Treehugger Robot [Tue, 13 Apr 2021 16:58:46 +0000 (16:58 +0000)]
[automerger skipped] Merge "OOB: Implement generateLocalOobData API" am: 1efb039447 am: 3d0737a82d am: 19c1816a48 -s ours

am skip reason: skip tag Change-Id I149907ef7ee3b6f9600ac57950afbc9616381dc0 with SHA-1 cebe459176 is already in history

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

Change-Id: I0bd563424196e9387582e8b8cea172fdc819245b

3 years agoMerge "Add time unit to AVDTP delay reporting value displayed for debugging." am...
Johanna Ye [Tue, 13 Apr 2021 16:58:27 +0000 (16:58 +0000)]
Merge "Add time unit to AVDTP delay reporting value displayed for debugging." am: 3d37198c66 am: c9c3029353 am: 8025932d06

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

Change-Id: I46661c2d4e10182d2443762142beac085136888a

3 years agoMerge "OOB: Implement generateLocalOobData API" am: 1efb039447 am: 3d0737a82d
Treehugger Robot [Tue, 13 Apr 2021 16:04:08 +0000 (16:04 +0000)]
Merge "OOB: Implement generateLocalOobData API" am: 1efb039447 am: 3d0737a82d

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

Change-Id: I3ac707f6b32d1ccdc2e3c410c4e9536ddf9cdaf5

3 years agoMerge "Add time unit to AVDTP delay reporting value displayed for debugging." am...
Johanna Ye [Tue, 13 Apr 2021 16:03:23 +0000 (16:03 +0000)]
Merge "Add time unit to AVDTP delay reporting value displayed for debugging." am: 3d37198c66 am: c9c3029353

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

Change-Id: Idfd4e269b5b5f0d4aec55d5b33bf0ca20d453312

3 years agoMerge "Add logging message to indicate collision with previous pending connection...
Johanna Ye [Tue, 13 Apr 2021 15:45:41 +0000 (15:45 +0000)]
Merge "Add logging message to indicate collision with previous pending connection from the same remote device." am: 4d15754de7 am: 2c72caebe5 am: 777fd7836b

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

Change-Id: Iac10e8e8fd43983249ea7acbf2adeaec1abfa6a0

3 years agoMerge "OOB: Implement generateLocalOobData API" am: 1efb039447
Treehugger Robot [Tue, 13 Apr 2021 15:44:38 +0000 (15:44 +0000)]
Merge "OOB: Implement generateLocalOobData API" am: 1efb039447

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

Change-Id: I270d7bc0825686dff8484a1beb8a3f221d431b67

3 years agoMerge "Add time unit to AVDTP delay reporting value displayed for debugging." am...
Johanna Ye [Tue, 13 Apr 2021 15:42:24 +0000 (15:42 +0000)]
Merge "Add time unit to AVDTP delay reporting value displayed for debugging." am: 3d37198c66

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

Change-Id: Icfacc2ee9810de5bd31e31eee5bc3b3e5f097546

3 years agoMerge "OOB: Implement generateLocalOobData API"
Treehugger Robot [Tue, 13 Apr 2021 15:28:25 +0000 (15:28 +0000)]
Merge "OOB: Implement generateLocalOobData API"

3 years agoMerge "Add time unit to AVDTP delay reporting value displayed for debugging."
Johanna Ye [Tue, 13 Apr 2021 14:56:11 +0000 (14:56 +0000)]
Merge "Add time unit to AVDTP delay reporting value displayed for debugging."

3 years agoMerge "Add logging message to indicate collision with previous pending connection...
Johanna Ye [Tue, 13 Apr 2021 14:55:35 +0000 (14:55 +0000)]
Merge "Add logging message to indicate collision with previous pending connection from the same remote device." am: 4d15754de7 am: 2c72caebe5

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

Change-Id: I279dad28d75b78f0c9dd6a259a4a18c4e87739f3

3 years agoMerge "Add logging message to indicate collision with previous pending connection...
Johanna Ye [Tue, 13 Apr 2021 14:14:27 +0000 (14:14 +0000)]
Merge "Add logging message to indicate collision with previous pending connection from the same remote device." am: 4d15754de7

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

Change-Id: I51b91ae19eceab15b940802694972435ed6c3005

3 years agoMerge "Add logging message to indicate collision with previous pending connection...
Johanna Ye [Tue, 13 Apr 2021 13:23:14 +0000 (13:23 +0000)]
Merge "Add logging message to indicate collision with previous pending connection from the same remote device."

3 years agoAdd time unit to AVDTP delay reporting value displayed for debugging.
Johanna Ye [Mon, 12 Apr 2021 11:34:18 +0000 (13:34 +0200)]
Add time unit to AVDTP delay reporting value displayed for debugging.

Tag: #refactor
Test: ADT3 with Pixel Buds
Bug: 182167357
Change-Id: Ie2527cc4c2e9cb871d15eb26417ae4814953de84

3 years agoRFCOMM: Handle configuration for pending connection
Chienyuan [Wed, 7 Apr 2021 13:34:55 +0000 (21:34 +0800)]
RFCOMM: Handle configuration for pending connection

Tag: #refactor
Bug: 183672787
Test: manual
Change-Id: I9a41c953dc87f9c804ea6624f60516d5e640904a

3 years agoMerge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145 am: bb5ecf6c54 am: f79aebb3b7
Josh Wu [Tue, 13 Apr 2021 04:54:27 +0000 (04:54 +0000)]
Merge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145 am: bb5ecf6c54 am: f79aebb3b7

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

Change-Id: I8c398bd6858437fbbb50f47a571e557edfa401c6

3 years agoMerge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145 am: bb5ecf6c54
Josh Wu [Tue, 13 Apr 2021 04:27:46 +0000 (04:27 +0000)]
Merge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145 am: bb5ecf6c54

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

Change-Id: I947c037ce2924ea438ba71052d26d3136e0a9415

3 years agoMerge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145
Josh Wu [Tue, 13 Apr 2021 03:42:53 +0000 (03:42 +0000)]
Merge "SCO: change D1 max latency to 0xFFFF" am: 2fc0084145

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

Change-Id: Ia6c022c984aeb85813c23056108d018c378927fb

3 years agoMerge "SCO: change D1 max latency to 0xFFFF"
Josh Wu [Tue, 13 Apr 2021 03:00:24 +0000 (03:00 +0000)]
Merge "SCO: change D1 max latency to 0xFFFF"

3 years agoMerge "Initial btif/test/btif_stack_test" am: f0eb6c4717 am: 910aac60a1 am: 091252d54d
Treehugger Robot [Mon, 12 Apr 2021 21:28:43 +0000 (21:28 +0000)]
Merge "Initial btif/test/btif_stack_test" am: f0eb6c4717 am: 910aac60a1 am: 091252d54d

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

Change-Id: I07ea11bb738104c576c0b06ff8ee48012e61145a

3 years agoMerge "Initial btif/test/btif_stack_test" am: f0eb6c4717 am: 910aac60a1
Treehugger Robot [Mon, 12 Apr 2021 20:30:27 +0000 (20:30 +0000)]
Merge "Initial btif/test/btif_stack_test" am: f0eb6c4717 am: 910aac60a1

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

Change-Id: I84a1926fc23f7d029be8efd52a8599aaaba6ccdd

3 years agoMerge "Initial btif/test/btif_stack_test" am: f0eb6c4717
Treehugger Robot [Mon, 12 Apr 2021 19:48:26 +0000 (19:48 +0000)]
Merge "Initial btif/test/btif_stack_test" am: f0eb6c4717

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

Change-Id: Ia809f5e44d770e415e666ba3411677a7204636c3

3 years agoMerge "Initial btif/test/btif_stack_test"
Treehugger Robot [Mon, 12 Apr 2021 19:20:44 +0000 (19:20 +0000)]
Merge "Initial btif/test/btif_stack_test"

3 years agoRemove not Hwbinder thread stopwatch caller am: babd23df27 am: 89b864348e am: 835f5bf043
weichinweng [Mon, 12 Apr 2021 19:09:54 +0000 (19:09 +0000)]
Remove not Hwbinder thread stopwatch caller am: babd23df27 am: 89b864348e am: 835f5bf043

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

Change-Id: If9c4f36701ce3833a7646b7ba7fd4c162ba2f2f4

3 years agoRemove not Hwbinder thread stopwatch caller am: babd23df27 am: 89b864348e
weichinweng [Mon, 12 Apr 2021 18:22:20 +0000 (18:22 +0000)]
Remove not Hwbinder thread stopwatch caller am: babd23df27 am: 89b864348e

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

Change-Id: Ied5209b76b4a9b807cbeff702b137957ecb65ef9

3 years agoRemove not Hwbinder thread stopwatch caller am: babd23df27
weichinweng [Mon, 12 Apr 2021 17:42:18 +0000 (17:42 +0000)]
Remove not Hwbinder thread stopwatch caller am: babd23df27

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

Change-Id: Ie48f4d564fe39173e66e701d2be7d7a0c0922259

3 years agoMerge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
Bill Yi [Mon, 12 Apr 2021 16:28:14 +0000 (09:28 -0700)]
Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE

Merged-In: I269fdcdf301bb442f124a0813db066441ae2e29f
Change-Id: I8625ed264939f8ce9ff9795fa38d081291e95d01

3 years agoAdd logging message to indicate collision with previous pending connection from the...
Johanna Ye [Tue, 23 Mar 2021 16:04:43 +0000 (17:04 +0100)]
Add logging message to indicate collision with previous pending connection from the same remote device.

Currently, When there's already a pending connecting procedure going on in the native layer (even if it were the same remote device), the native layer returns BT_STATUS_BUSY which is then interpreted by the JNI layer as a failure to connect, resulting in a disconnection request.

This adds logging message when this happens, until there's a clear
indication to prioritize a complete fix.

Tag: #stability
Bug: 174127136
Test: manual through repeated connections in ADT3 OOBE
Change-Id: Ifc84e883f8ae248ecfa99556465c22b32ce82f79

3 years agoSCO: change D1 max latency to 0xFFFF
Josh Wu [Mon, 12 Apr 2021 09:43:35 +0000 (17:43 +0800)]
SCO: change D1 max latency to 0xFFFF

Although classic SCO cannot retransmit, the max latency should be
0xFFFF(Don't care) instead of 0(reserved, not 0ms).

Tag: #compatibility
Bug: 185093884
Test: atest BluetoothInstrumentationTests
Change-Id: Ia287c32e771eff1e5550fbb2098d70c520689250

3 years agoRemove not Hwbinder thread stopwatch caller
weichinweng [Mon, 12 Apr 2021 08:16:58 +0000 (16:16 +0800)]
Remove not Hwbinder thread stopwatch caller

Bug: 185083209
Test: atest BluetoothInstrumentationTests
Tag: #stability
Change-Id: I14aa41d741c30a9470929a19b633d0d936adcf04

3 years agoInitial btif/test/btif_stack_test
Chris Manton [Thu, 8 Apr 2021 00:37:08 +0000 (17:37 -0700)]
Initial btif/test/btif_stack_test

Bug: 182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
No-Typo-Check: Legacy code mocks

Change-Id: I5cf4b24651b436a96bfbba43ad33db28707352e3

3 years agovc: Initial field in constructor am: c435f425cb am: cf474bbfa2 am: 75e75f01bd
Greg Kaiser [Fri, 9 Apr 2021 18:37:28 +0000 (18:37 +0000)]
vc: Initial field in constructor am: c435f425cb am: cf474bbfa2 am: 75e75f01bd

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

Change-Id: I47c73c0b232d0e4b7b79537eae23e37095559a48

3 years agovc: Initial field in constructor am: c435f425cb am: cf474bbfa2
Greg Kaiser [Fri, 9 Apr 2021 17:48:53 +0000 (17:48 +0000)]
vc: Initial field in constructor am: c435f425cb am: cf474bbfa2

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

Change-Id: I269fdcdf301bb442f124a0813db066441ae2e29f

3 years agovc: Initial field in constructor am: c435f425cb
Greg Kaiser [Fri, 9 Apr 2021 17:07:19 +0000 (17:07 +0000)]
vc: Initial field in constructor am: c435f425cb

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

Change-Id: I7522a70f85a0c2a7086805d0e44f9f0528df4e51

3 years agovc: Initial field in constructor
Greg Kaiser [Fri, 9 Apr 2021 14:10:44 +0000 (07:10 -0700)]
vc: Initial field in constructor

The 'flags' field was our only field not initialized in our
constructor.  To assure consistent behavior, we initialize it
here.

Test: TreeHugger
Change-Id: I92c94eb5a995b5980d635f2c6d1cb12bf28ef4ca

3 years agobtm_iso: Allow to start ISO by many clients am: 1c51c0afce am: f901447477 am: a9019e8b1f
Łukasz Rymanowski [Fri, 9 Apr 2021 13:15:15 +0000 (13:15 +0000)]
btm_iso: Allow to start ISO by many clients am: 1c51c0afce am: f901447477 am: a9019e8b1f

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

Change-Id: I9856bcbddbf08ebe732b1388f1554e5621c8206d

3 years agobtm_iso: Allow to start ISO by many clients am: 1c51c0afce am: f901447477
Łukasz Rymanowski [Fri, 9 Apr 2021 12:25:29 +0000 (12:25 +0000)]
btm_iso: Allow to start ISO by many clients am: 1c51c0afce am: f901447477

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

Change-Id: I8e39c672d658511bcaa693fb17d805d17fd7f499

3 years agobtm_iso: Allow to start ISO by many clients am: 1c51c0afce
Łukasz Rymanowski [Fri, 9 Apr 2021 11:42:19 +0000 (11:42 +0000)]
btm_iso: Allow to start ISO by many clients am: 1c51c0afce

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

Change-Id: Ibdd5c2a03e579a16df77c50a53d693a37271202a

3 years agoMerge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566 am: 517d15cf1e am...
Treehugger Robot [Fri, 9 Apr 2021 11:21:54 +0000 (11:21 +0000)]
Merge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566 am: 517d15cf1e am: fe1c30ff15

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

Change-Id: I55fd566e51a8f0fbc93e4df2a0d73df231fd27ee

3 years agobtm_iso: Allow to start ISO by many clients
Łukasz Rymanowski [Mon, 4 Jan 2021 14:45:50 +0000 (14:45 +0000)]
btm_iso: Allow to start ISO by many clients

It turns out we might need btm_iso to be stated from more than one place
e.g. broadcast and unicast scenario.

Therefore, allow for that.

Bug: 150670922
Tag: #feature
Test: atest --host net_test_btm_iso
Sponsor: jpawlowski@

Change-Id: I8111a55707a00b5622a260f938e0da08fc37ae65

3 years agoMerge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566 am: 517d15cf1e
Treehugger Robot [Fri, 9 Apr 2021 10:55:32 +0000 (10:55 +0000)]
Merge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566 am: 517d15cf1e

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

Change-Id: Id28fe68fff42ddf66ff94ce4c7de6fbecf52db99

3 years agoMerge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566
Treehugger Robot [Fri, 9 Apr 2021 09:38:05 +0000 (09:38 +0000)]
Merge "HCI: Accept erroneous ConnectionComplete" am: 4af4ff7566

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

Change-Id: I0de79dd1131a5fb4f63dd8f90c30646025f3b91a

3 years agoMerge "HCI: Accept erroneous ConnectionComplete"
Treehugger Robot [Fri, 9 Apr 2021 08:59:21 +0000 (08:59 +0000)]
Merge "HCI: Accept erroneous ConnectionComplete"

3 years agoaudio: Introduce LE Audio support for client interface and HAL am: 944543dadb am...
Grzegorz Kołodziejczyk [Fri, 9 Apr 2021 08:57:19 +0000 (08:57 +0000)]
audio: Introduce LE Audio support for client interface and HAL am: 944543dadb am: 0b7719a4a0 am: 1f1c2be108

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

Change-Id: I3c6ce94f4243045183906a8ee3eae8bc4cada231

3 years agoaudio: Introduce LE Audio support for client interface and HAL am: 944543dadb am...
Grzegorz Kołodziejczyk [Fri, 9 Apr 2021 08:29:55 +0000 (08:29 +0000)]
audio: Introduce LE Audio support for client interface and HAL am: 944543dadb am: 0b7719a4a0

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

Change-Id: I1029340facc570de1af163a770eb311a1c0309e3

3 years agoRe-log btif/src/stack_manager am: 7923f613fe am: a5535be197 am: e183e04fc9
Chris Manton [Fri, 9 Apr 2021 08:04:09 +0000 (08:04 +0000)]
Re-log btif/src/stack_manager am: 7923f613fe am: a5535be197 am: e183e04fc9

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

Change-Id: I15b4f71b7f3c5a29674900b61955e20480cb0527

3 years agoAdd layer of indirection to set hal_callbacks am: 6869395b5f am: f48bddb8b0 am: d3598...
Chris Manton [Fri, 9 Apr 2021 08:04:06 +0000 (08:04 +0000)]
Add layer of indirection to set hal_callbacks am: 6869395b5f am: f48bddb8b0 am: d35983050a

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

Change-Id: I6ce9666eb41d7d2696677c76a3b4ae23e9b5d3b0

3 years agoCononicalize include pathnames am: 1dcbf80e0a am: 397286a97a am: 38cdc7f01d
Chris Manton [Fri, 9 Apr 2021 08:04:04 +0000 (08:04 +0000)]
Cononicalize include pathnames am: 1dcbf80e0a am: 397286a97a am: 38cdc7f01d

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

Change-Id: Ief681a69f8ccd9f6f5aec0df8420b4bb5fb81f20

3 years agoRemove execute bits btif/:: am: 6938800037 am: 3089b6f415 am: 5dc1ff9b39
Chris Manton [Fri, 9 Apr 2021 08:04:03 +0000 (08:04 +0000)]
Remove execute bits btif/:: am: 6938800037 am: 3089b6f415 am: 5dc1ff9b39

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

Change-Id: I5da8d50d30f4662a507f3f3b79b03e27f54cfb43

3 years agoaudio: Introduce LE Audio support for client interface and HAL am: 944543dadb
Grzegorz Kołodziejczyk [Fri, 9 Apr 2021 07:39:15 +0000 (07:39 +0000)]
audio: Introduce LE Audio support for client interface and HAL am: 944543dadb

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

Change-Id: If100a9ae30f2b344e08d8b73b1c076dc992e67c4

3 years agoRe-log btif/src/stack_manager am: 7923f613fe am: a5535be197
Chris Manton [Fri, 9 Apr 2021 07:17:28 +0000 (07:17 +0000)]
Re-log btif/src/stack_manager am: 7923f613fe am: a5535be197

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

Change-Id: I1e46fe17b1eecb0911afaee388ec8e498e934ccb

3 years agoAdd layer of indirection to set hal_callbacks am: 6869395b5f am: f48bddb8b0
Chris Manton [Fri, 9 Apr 2021 07:17:27 +0000 (07:17 +0000)]
Add layer of indirection to set hal_callbacks am: 6869395b5f am: f48bddb8b0

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

Change-Id: If4dea361ce1418ea88536007441f39d295df7deb

3 years agoCononicalize include pathnames am: 1dcbf80e0a am: 397286a97a
Chris Manton [Fri, 9 Apr 2021 07:17:26 +0000 (07:17 +0000)]
Cononicalize include pathnames am: 1dcbf80e0a am: 397286a97a

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

Change-Id: I1fcc1c9a13d968c63defedb20a08493b0df45698

3 years agoRemove execute bits btif/:: am: 6938800037 am: 3089b6f415
Chris Manton [Fri, 9 Apr 2021 07:17:25 +0000 (07:17 +0000)]
Remove execute bits btif/:: am: 6938800037 am: 3089b6f415

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

Change-Id: I00e1a9fafb56a116e600e02b1383392abaad8fb3

3 years agoaudio: Introduce LE Audio support for client interface and HAL
Grzegorz Kołodziejczyk [Fri, 26 Feb 2021 21:38:37 +0000 (21:38 +0000)]
audio: Introduce LE Audio support for client interface and HAL

Patch introduces support for client interface and HAL.

Tag: #feature
Test: atest bluetooth-test-audio-hal-interface
Sponsor: jpawlowski@
Bug: 150670922
Change-Id: Idddddc403aacc671d8010f8c6004038ffe53da8f

3 years agoRe-log btif/src/stack_manager am: 7923f613fe
Chris Manton [Fri, 9 Apr 2021 06:35:28 +0000 (06:35 +0000)]
Re-log btif/src/stack_manager am: 7923f613fe

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

Change-Id: I8462f1585e1ef5f2b008c00375a1a20863f58f08

3 years agoAdd layer of indirection to set hal_callbacks am: 6869395b5f
Chris Manton [Fri, 9 Apr 2021 06:35:26 +0000 (06:35 +0000)]
Add layer of indirection to set hal_callbacks am: 6869395b5f

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

Change-Id: Idb81558fb6a18ffc5ca6b967fcba208fafaa176b

3 years agoCononicalize include pathnames am: 1dcbf80e0a
Chris Manton [Fri, 9 Apr 2021 06:35:24 +0000 (06:35 +0000)]
Cononicalize include pathnames am: 1dcbf80e0a

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

Change-Id: I625540239f09f3ef04092795fb74b7ffd0548146

3 years agoRemove execute bits btif/:: am: 6938800037
Chris Manton [Fri, 9 Apr 2021 06:34:22 +0000 (06:34 +0000)]
Remove execute bits btif/:: am: 6938800037

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

Change-Id: I84a3cd6931b6aeeb0450d0d8a9fdb08b35473448

3 years agoPrint stopwatch log when the bluetooth HAL died. am: 1a7586dd08 am: 944c6f9ba7 am...
weichinweng [Fri, 9 Apr 2021 04:10:25 +0000 (04:10 +0000)]
Print stopwatch log when the bluetooth HAL died. am: 1a7586dd08 am: 944c6f9ba7 am: e5a4d18762

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

Change-Id: I2fc0a427e956e656b613eb6458e55d79e68ad514

3 years agoPrint stopwatch log when the bluetooth HAL died. am: 1a7586dd08 am: 944c6f9ba7
weichinweng [Fri, 9 Apr 2021 03:21:27 +0000 (03:21 +0000)]
Print stopwatch log when the bluetooth HAL died. am: 1a7586dd08 am: 944c6f9ba7

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

Change-Id: If33076ac33ea4bcce4f00a9a30f89f855918ac79