Commit Graph

1953 Commits

Author SHA1 Message Date
Alice Kuo
6dbed8d2bc Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" into stage-aosp-master am: cc3fb6dd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15849150

Change-Id: I49463a0ba27e362a6b297e018d70ef9ea7739531
2021-09-18 00:54:13 +00:00
Alice Kuo
e12ff23a6d csip: Expose an extra data with intent and store in CachedBluetoothDevice
Bug: 178981521
Bug: 150670922
Test: Discover and pair with the CSIP supported device, and check the
pairing string in the dialog

Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
2021-09-17 17:29:11 +00:00
Qasim Javed
96db9a7448 Merge "Make createBond(int) a system API" into stage-aosp-master am: 5a4c7d4aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15845318

Change-Id: I0e621e1aab15fa6e5e06fa8f8e4df82eab1c549c
2021-09-16 22:59:29 +00:00
Qasim Javed
5cebaaa562 Make createBond(int) a system API
BUG: 195156317
Test: Manual

Change-Id: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
2021-09-16 13:07:58 -07:00
Jakub Pawlowski
e5cd75cfd8 Merge "csip: Add Coordinated Set Identification Profile" into stage-aosp-master am: c258dbbb52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795671

Change-Id: Ifd042637397e43e6969f7de67b8da84fc2230ccb
2021-09-13 18:01:06 +00:00
Jakub Pawlowski
c258dbbb52 Merge "csip: Add Coordinated Set Identification Profile" into stage-aosp-master 2021-09-13 17:35:37 +00:00
Roopa Sattiraju
41dc0fb942 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" into stage-aosp-master am: 913ea0a167
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15728282

Change-Id: Ie0c79a9d5ae7873f21676ce1c615ee41a22fa394
2021-09-13 17:04:00 +00:00
Roopa Sattiraju
913ea0a167 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" into stage-aosp-master 2021-09-13 16:47:57 +00:00
Łukasz Rymanowski
d35f8bcddc csip: Add Coordinated Set Identification Profile
Tag: #feature
Test: atest CsipSetCoordinatorStateMachineTest CsipSetCoordinatorServiceTest
Bug: 150670922
Sponsor: jpawlowski@
Change-Id: I67536ddcc32ace82d63e19426dce19f2bc69cdea
2021-09-11 08:55:01 +02:00
Roopa Sattiraju
ce1d2e1fb4 Changing BluetoothHeadset APIs from @hide to @SystemApi
For isInbandringing API - it is used in the call journey and would
change the behavior(undeterministic) of the call if not used.

Stop/StartScoUsingVirtualVoiceCall is used in the BluetoothShim layer
specifically for testing and mocking in the Android Apps. Seems
reasonable to keep this as a SystemAPI given that it has no params and
unlikely to be changed.

Bug: 195160939
Tag: #feature
Test: Manual
Change-Id: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
2021-09-09 14:14:12 -07:00
Jakub Pawlowski
22c3b6feeb Merge "le_audio: Introduce connection state handling for LE Audio group" into stage-aosp-master am: 2f0430af32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736950

Change-Id: Ia5cbf0034a06e9691cab5766d4283a92fe73f98c
2021-09-03 12:13:36 +00:00
Grzegorz Kołodziejczyk
59b2baa872 le_audio: Introduce connection state handling for LE Audio group
Patch implements connection state handling for LE Audio device group.

Tag: #feature
Test: Set LE audio device as active
Sponsor: jpawlowski@
Bug: 150670922
Change-Id: I11222ca07e265ac8b6dc3c21650874ebeffa473c
2021-09-02 18:12:10 +02:00
TreeHugger Robot
03567d8023 Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a307631e am: f6db6bcb3e am: a6e0765cab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111

Change-Id: I94bd7e46b1c80e5ce2b5cdae518a51798d827948
2021-08-31 23:30:49 +00:00
TreeHugger Robot
a6e0765cab Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a307631e am: f6db6bcb3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111

Change-Id: I9999e1ba63d697298d037aee29f7a449ba9cb008
2021-08-31 23:18:56 +00:00
Jakub Pawlowski
dd0710147b Merge "csip: Add constants for the Coordinated Set Identification Profile" am: 54beaf2012 am: f0307d111e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807297

Change-Id: I46e543b7fd25dbb74d97551cab50a18cfaad594d
2021-08-30 21:27:10 +00:00
Jakub Pawlowski
f0307d111e Merge "csip: Add constants for the Coordinated Set Identification Profile" am: 54beaf2012
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807297

Change-Id: I707c1fdd5831763a3bcdfa819e61ea3b01707110
2021-08-30 21:10:26 +00:00
Jakub Pawlowski
54beaf2012 Merge "csip: Add constants for the Coordinated Set Identification Profile" 2021-08-30 20:56:25 +00:00
Łukasz Rymanowski
c1b80e05e8 csip: Add constants for the Coordinated Set Identification Profile
Bug: 150670922
Tag: #feature
Test: compilation
Sponsor: jpawlowski@
Change-Id: I331fe270b75f306d57a15933ab4afa2e48c8bf50
2021-08-24 08:35:01 +00:00
Alice Kuo
21ff734712 Add a system api to fetch uuids by the specific transport
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.

Ignore-AOSP-First: avoid merge conflict
Tag: #feature
Bug: 194447999
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
Merged-In: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-20 16:26:24 +00:00
Alice Kuo
ee29136541 Add a system api to fetch uuids by the specific transport
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.

Tag: #feature
Bug: 197195548
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
Merged-In: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-19 15:29:32 +00:00
TreeHugger Robot
a928d17bd8 Merge "Add a system api to fetch uuids by the specific transport" into sc-dev-plus-aosp 2021-08-19 00:16:33 +00:00
Hansong Zhang
3c4a917cb9 Bluetooth: Fix formatting in getAlias()
Bug: 180747689
Test: manual
Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
2021-08-18 23:43:45 +00:00
Alice Kuo
d4a2b02a6a Add a system api to fetch uuids by the specific transport
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.

Ignore-AOSP-First: avoid merge conflict
Tag: #feature
Bug: 194447999
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-17 01:56:47 +00:00
Jeff Sharkey
512bc4c6ec Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I7e3ef6ca49e2c4ed4a4876b23ae5889c257f4f2f
2021-08-13 13:10:06 +00:00
Jeff Sharkey
f0fa7f9b4a Register IBluetoothManagerCallback per-process.
As part of introducing AttributionSource across the Bluetooth stack
earlier this year, each BluetoothAdapter instance is now associated
with a specific AttributionSource, and several instances of shared
static code were made BluetoothAdapter-specific so they could be
augmented with the relevant AttributionSource.

However, processes that create many BluetoothAdapter instances can
overload the system, since a IBluetoothManagerCallback was registered
for each instance.  This change mitigates this by only registering a
single IBluetoothManagerCallback for the entire process, and it
then reuses the existing sProxyServiceStateCallbacks list for
dispatching events to all active adapters within the process.

Since it's so late in the release, we keep both mService and
sService intact to minimize the size of this CL; future work should
refactor to a more robust design, such as Supplier<IBluetooth>.

Bug: 195286998, 172022978
Test: atest BluetoothInstrumentationTests
Change-Id: I012f3f65e61eaf55e40436486806e56506c928ee
2021-08-11 12:23:01 -06:00
Treehugger Robot
cf2ef57519 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" 2021-08-11 04:44:53 +00:00
Rahul Sabnis
465f489430 Require calls to BluetoothA2dp#setBufferLengthMillis to pass a
non-negative value

Tag: #feature
Bug: 194837771
Test: Manual
Merged-In: I3c1d2da1d28a494d8b393c4502521b3f0699adf6
Change-Id: I3c1d2da1d28a494d8b393c4502521b3f0699adf6
2021-08-10 13:57:57 -07:00
Treehugger Robot
0d7b83fdfc Merge changes Icabed06e,I25bc13c6 am: afce05e2e5 am: 9de9c7f693
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328

Change-Id: I50a17e3b0a1d0da3794db7704585a7d1df3af14e
2021-08-10 02:45:37 +00:00
Treehugger Robot
afce05e2e5 Merge changes Icabed06e,I25bc13c6
* changes:
  Bluetooth: Add Media Control Profile
  Bluetooth: Add GATT_INSUFFICIENT_AUTHORIZATION error code
2021-08-10 02:14:33 +00:00
Jakub Tyszkowski
723fe23ce8 Bluetooth: Add Media Control Profile
Tag: #feature
Bug: 150670922
Sponsor: jpawlowski@
Test: compilation
Change-Id: Icabed06e6b1973ecee9cd1d6eeec80c6d2a9d72e
2021-08-09 15:37:52 +00:00
Jakub Tyszkowski
c74aebb4db Bluetooth: Add GATT_INSUFFICIENT_AUTHORIZATION error code
Bug: 150670922
Sponsor: jpawlowski@
Tag: #feature
Test: compilation
Change-Id: I25bc13c658caba48cc37b0f1f253a77fd1336b29
2021-08-09 15:34:22 +00:00
Martin Brabham
e0276d9c70 Merge "Add implementation for IRK to parcelable functions." into sc-dev 2021-07-30 18:57:19 +00:00
Martin Brabham
a2657cf70a Merge "Add implementation for IRK to parcelable functions." am: 400c21483c am: 234cdb9d8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780808

Change-Id: I3b58d01895182c3dc970589e453cbebf2bdf7c50
2021-07-29 21:45:39 +00:00
Martin Brabham
0ef17f16bd Add implementation for IRK to parcelable functions.
Bug: 194432570
Test: Manual test app; nRF connect
Tag: #feature
Change-Id: I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9
Merged-In: I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9
2021-07-29 10:45:46 -07:00
Martin Brabham
60b797bd5c Add implementation for IRK to parcelable functions.
Bug: 194432570
Test: Manual test app; nRF connect
Tag: #feature
Change-Id: I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9
2021-07-29 09:42:37 -07:00
Rahul Sabnis
7d712166f8 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294

Change-Id: I4b9472cec4e2f588752969df40ef81bed48b5097
2021-07-28 22:15:18 +00:00
Rahul Sabnis
7a3cb23bf9 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev 2021-07-28 22:04:30 +00:00
Jakub Pawlowski
982531f1dd Merge "Prevent create bond for null MAC address" am: b0c01df940 am: 8d313940b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776317

Change-Id: I42b68e9ddfad158e2b091ca60f57781081058913
2021-07-28 18:28:35 +00:00
Etienne Ruffieux
84abea03d6 Prevent create bond for null MAC address
Tag: #feature
Bug: 193702115
Test: atest BluetoothInstrumentationTests
Change-Id: I5684f00cf4a567a899c958b94af22ccf5067b476
2021-07-28 17:57:35 +00:00
Rahul Sabnis
1d3b83664a Require calls to BluetoothA2dp#setBufferLengthMillis to pass a
non-negative value

Tag: #feature
Bug: 194837771
Test: Manual
Change-Id: I3c1d2da1d28a494d8b393c4502521b3f0699adf6
2021-07-27 15:49:04 -07:00
Treehugger Robot
cba7cd3692 Merge "Unify the mismatch in the byte order of the address." am: 265e8cf670 am: 5afd176d2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771607

Change-Id: I884831da10014db35c5590576a24bca4101a481f
2021-07-21 18:17:22 +00:00
Yunsik Bae
674b160164 Unify the mismatch in the byte order of the address.
Bluetooth address should check MSB for AddrType based on Spec.
(BT Core Spec v 5.2 | Vol 6, Part B, 1.3 DEVICE ADDRESS)
Bluetooth address meaning is not unified in the current Android framework layer.
Because of this, cannot register scanfilter with the intended address format.

Bug: 180466950
Test: manual
Tag: #compatibility
Change-Id: I59a1b5538e4f3fea77a98cba2aa46649fc32ac6b
Merged-In: I59a1b5538e4f3fea77a98cba2aa46649fc32ac6b
2021-07-20 11:20:43 -07:00
Yunsik Bae
4d990467b2 Unify the mismatch in the byte order of the address.
Bluetooth address should check MSB for AddrType based on Spec.
(BT Core Spec v 5.2 | Vol 6, Part B, 1.3 DEVICE ADDRESS)
Bluetooth address meaning is not unified in the current Android framework layer.
Because of this, cannot register scanfilter with the intended address format.

Bug: 180466950
Test: manual
Tag: #compatibility
Change-Id: I59a1b5538e4f3fea77a98cba2aa46649fc32ac6b
2021-07-20 10:53:09 +00:00
Jakub Pawlowski
6ea20906f3 Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
It's not used anywhere, and the implementation actually never do
anything.

Bug: 192615539
Merged-In: Icf8906c972cf18d65a22d30c3a628fd54db59179
Change-Id: Icf8906c972cf18d65a22d30c3a628fd54db59179
2021-07-14 17:16:19 +02:00
Jakub Pawlowski
5aa40b903a Get rid of ResultStorageDescriptor in startScan
It's never used

Bug: 192615539
Merged-In: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
Change-Id: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
2021-07-14 16:58:20 +02:00
Jakub Pawlowski
866cf34016 Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
It's not used anywhere, and the implementation actually never do
anything.

Bug: 192615539
Merged-In: Icf8906c972cf18d65a22d30c3a628fd54db59179
Change-Id: Icf8906c972cf18d65a22d30c3a628fd54db59179
2021-07-14 09:14:41 +00:00
Jakub Pawlowski
374836844e Get rid of ResultStorageDescriptor in startScan
It's never used

Bug: 192615539
Merged-In: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
Change-Id: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
2021-07-14 09:14:12 +00:00
Johanna Ye
cfa6f14403 Merge "Fix long characteristic write concurrency bug." 2021-07-09 15:39:32 +00:00
Johanna Ye
dad2385daf Merge "Fix long characteristic write concurrency bug." into sc-dev-plus-aosp 2021-07-09 12:06:58 +00:00
TreeHugger Robot
eed6b1b8d1 Merge "Tag some "new Binder()" instances to detect leaks." into sc-dev am: c8955e0799
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225384

Change-Id: I97ad328303c4c297294400a74d887c9067d4f2ba
2021-07-08 00:45:01 +00:00