Commit Graph

1976 Commits

Author SHA1 Message Date
TreeHugger Robot
f81f06da29 Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: I4406ed3171a05afc52155faeb226fe4b66da2735
2021-10-05 17:32:24 +00:00
TreeHugger Robot
d34ebacb36 Merge "Use AttributionSource Builder" into stage-aosp-master 2021-10-05 17:17:13 +00:00
William Escande
5273fe8d5b Merge "Add getActiveDevices api" into stage-aosp-master am: c8852ad54d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853560

Change-Id: Iec72b027795c2140a5135c44261cc82895d02f00
2021-10-02 00:03:22 +00:00
William Escande
c8852ad54d Merge "Add getActiveDevices api" into stage-aosp-master 2021-10-01 23:50:44 +00:00
Sal Savage
7db301321d Make BluetoothAdapter#disable(boolean persist) a @SystemApi am: 8dafa60a2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960228

Change-Id: If15d419a35511cd47ad2f586856abe1af5d2d6ce
2021-10-01 20:33:24 +00:00
Sal Savage
8dafa60a2f Make BluetoothAdapter#disable(boolean persist) a @SystemApi
Bug: 196235708
Test: build, flash car hardware, test basic functionality
Change-Id: I952c3d2ce3b7ec70a384e9a96e172d6ab90c23e8
2021-10-01 18:17:37 +00:00
wescande
c3d0b147f5 Add getActiveDevices api
Bug: 195149213
Test: Manual
Tag: #feature
Change-Id: I0836f7bd0009a49b4db7f08e9f347fe3e1a76f84
2021-10-01 16:30:18 +02:00
Rahul Sabnis
0db21e73d3 Merge "Add BluetoothDevice#connect and BluetoothDevice#disconnect as System APIs" into stage-aosp-master am: 4a39b54ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936310

Change-Id: Id87b5e9741f9abab79a42cf0839525ae25edfdd9
2021-09-30 18:21:51 +00:00
Rahul Sabnis
d0afc1895a Add BluetoothDevice#connect and BluetoothDevice#disconnect as System APIs
Tag: #feature
Bug: 201462141
Test: Manual
Change-Id: I79332c63e99efd9e90036ba2c693835151cc1240
2021-09-29 23:15:37 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +00:00
William Escande
c05e55ffbf Use AttributionSource Builder
Attribution source constructor are hidden api
Add a Builder option to take a AttributionSource as parameter

Test: atest BluetoothInstrumentationTests
Bug: 195144968
Tag: #refactor
Ignore-AOSP-First: No such thing on aosp
Change-Id: I901c8afff6a40bd8484fd8e10baf290aa483c280
2021-09-22 20:22:36 +02:00
Roopa Sattiraju
398c639067 Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical" am: 2279402490 am: e7087432f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829234

Change-Id: I4957f8ca3d3dc3c2e323fa3cf6914e3e9b63e94d
2021-09-20 19:54:21 +00:00
Roopa Sattiraju
e7087432f6 Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical" am: 2279402490
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829234

Change-Id: I95bc17bce0aedca17e0cf8ae57a66a8056fe3c68
2021-09-20 19:42:30 +00:00
Roopa Sattiraju
2279402490 Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical" 2021-09-20 19:05:39 +00:00
Treehugger Robot
a9c6fbdff7 Merge "Make createBond(int) a system API" 2021-09-20 15:52:02 +00:00
Alice Kuo
399c36babb 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

Merged-In: I3e99c59e0cb974409291e1b4c28393106784e133
Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
2021-09-18 01:02:32 +00:00
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
Roopa Sattiraju
b3ba6cdbed Adding sattiraju@ as OWNER and also changing the order of ldaps to be
alphabetical

Tag: #feature
Bug: 200240100
Test: Manual
Change-Id: I15ccfeae1e1a061a002be9c2e202104352b1ce98
2021-09-16 23:47:19 -07: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
d93483f74b Make createBond(int) a system API
BUG: 195156317
Test: Manual

Change-Id: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
Merged-In: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
2021-09-16 22:38:47 +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
Roopa Sattiraju
2ef5e10f45 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" 2021-09-15 01:12:09 +00:00
Łukasz Rymanowski
58ad9295c7 csip: Add Coordinated Set Identification Profile
Tag: #feature
Test: atest CsipSetCoordinatorStateMachineTest CsipSetCoordinatorServiceTest
Bug: 150670922
Sponsor: jpawlowski@
Merged-In: I67536ddcc32ace82d63e19426dce19f2bc69cdea
Change-Id: I67536ddcc32ace82d63e19426dce19f2bc69cdea
2021-09-13 19:02:10 +00: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
943ac64f97 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
Merged-In: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
Change-Id: I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb
2021-09-09 15:48:15 -07: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
46aba35609 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
Merged-In: I11222ca07e265ac8b6dc3c21650874ebeffa473c
Change-Id: I11222ca07e265ac8b6dc3c21650874ebeffa473c
2021-09-03 11:58:32 +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
65cedbaa32 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
(cherry picked from commit f0fa7f9b4a)
2021-08-13 19:39:48 +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