Commit Graph

1809 Commits

Author SHA1 Message Date
Martin Brabham
a45008561e Fix CTS Failure
Bug: 182849735
Test: atest CtsSystemApiAnnotationTestCases:android.signature.cts.api.AnnotationTest#testAnnotation -- --abi x86_64
Change-Id: I1b9e77b05cd23299bf179c854e136fa341c81566
2021-03-16 16:22:56 -07:00
Martin Brabham
6ab241ca6a Bluetooth: Modify and append to the Out-of-Band API
- Modify createOutOfBand to be a SystemApi, and accept p192 and p256 data objects.
 - Modify OobData to become a SystemApi and to provide a Builder pattern for creation.

CTS-Coverage-Bug: 182420103
Bug: 178007935
Test: compiles and runs
Tag: #feature
Change-Id: I46aec8c2cb64a8da8957d01d32b879d60df7a31c
2021-03-10 16:39:56 -08:00
Rahul Sabnis
d65ce8e59f Merge "Derestrict some APIs." am: 8e97fea3c2 am: 4651bc7b96 am: 6b93271842
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I467147251bf2f581bc3c5bbb823324660bd935fe
2021-03-09 23:10:06 +00:00
Rahul Sabnis
8e97fea3c2 Merge "Derestrict some APIs." 2021-03-09 21:29:12 +00:00
Mathew Inwood
cbc3132096 Derestrict some APIs.
They were retricted because we thought they were unused, but it turns out
that they are needed afterall.

NoNonSdkCheck: 170729553

Bug: 181103983
Test: N/A
Change-Id: Iddf7916456be27d60d2a7520d7cadcda1d04cac6
2021-03-09 21:24:00 +00:00
Xin Li
1af6a12e98 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:39 +00:00
Jakub Pawlowski
cce8e9ec91 Merge "Fix comment typo in PeriodicAdvertisingParameters" am: d806639032 am: 5b746422d6 am: 81c2336e23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1452acbb0e4ad1c72633a849441619cf82002c65
2021-03-03 20:24:46 +00:00
Jakub Pawlowski
5b746422d6 Merge "Fix comment typo in PeriodicAdvertisingParameters" am: d806639032
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20348933b26ae9dc07b20370832ea52187362c17
2021-03-03 19:09:20 +00:00
Jakub Pawlowski
5629c959bf Fix comment typo in PeriodicAdvertisingParameters
Bug: 176967118
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I1777ca23ba6f395eeb2ec98b970ccbf920661663
2021-03-03 18:45:45 +00:00
Treehugger Robot
021a8f8852 Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c am: e1826640ee am: 81056adb88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia447b1cd574a51477d1dd383dbeaa694ace7ffb9
2021-03-03 13:30:03 +00:00
Treehugger Robot
e1826640ee Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc6c331894be59140f379a443260edaafc05aa1
2021-03-03 08:54:49 +00:00
Treehugger Robot
ad1bbc487c Merge "Additional metadata keys for Fast Pair" 2021-03-03 08:15:22 +00:00
Ugo Yu
370ecf007c Additional metadata keys for Fast Pair
Tag: #feature
Bug: 171387275
Test: atest BluetoothInstrumentationTests
Change-Id: I98f4cbd214437d1cd3681be03108c824ad087260
2021-03-02 14:44:41 +08:00
More Kuo
d3ad78bade Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a am: 51beeda872
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234ca0e0c123293a56516e1ed461bfbd9f5b1481
2021-02-24 02:14:06 +00:00
More Kuo
e90bacbc0a Merge "Update BluetoothA2dp API" am: ae6583b34f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fc9c4dad0013ecd62788417054f872f29dc775f
2021-02-24 00:39:44 +00:00
Andrew Cheng
a262cfe5ca Surface ACL disconnect reasons from native to Java am: b8e09882d8 am: c12293f799 am: 7d898bc6f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1006ed22244cf926dc91fa7001d8594b4ebb976
2021-02-24 00:18:18 +00:00
Andrew Cheng
c12293f799 Surface ACL disconnect reasons from native to Java am: b8e09882d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70317579c1235d84a4c491823c8b9747e135ff34
2021-02-23 23:41:17 +00:00
Andrew Cheng
4757f6cd7f Make BluetoothConnectionCallback static am: 8ef54b299e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1b69b7ef8ea255fea87d68ae8806b437319d885
2021-02-23 23:38:24 +00:00
Joseph Pirozzo
3a7541cad1 Merge "Add BluetoothMapClient to system API" am: 9cabf5a07b am: 0a5ceea870 am: 2c4a4be615
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f8b277c6f9e8ecb847285108ef4cc1b856516fe
2021-02-23 22:57:09 +00:00
Joseph Pirozzo
0a5ceea870 Merge "Add BluetoothMapClient to system API" am: 9cabf5a07b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie60ce04dd17204740027fb7a1198bcd05e0b9012
2021-02-23 22:31:48 +00:00
More Kuo
ae6583b34f Merge "Update BluetoothA2dp API" 2021-02-23 02:37:41 +00:00
Andrew Cheng
1c276e7591 Merge changes from topic "hci-disconnect-reason"
* changes:
  Update Companion to new BluetoothConnectionCallback
  Add BluetoothConnectionCallback to Companion App
  Surface ACL disconnect reasons from native to Java
  Make BluetoothConnectionCallback static
2021-02-22 19:25:13 +00:00
Xin Li
be473bf819 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
2021-02-21 09:39:53 -08:00
Andrew Cheng
b8e09882d8 Surface ACL disconnect reasons from native to Java
HCI disconnect commands and events have an accompanying "reason"
parameter comprising of a HCI error code. This can be useful in both
debugging and re-connection logic at the Java level.

This CL grabs the HCI codes from native and passes it up to Java via an
extra parameter to existing ACL connection callbacks.

Tag: #feature
Bug: 177668957
Test: atest BluetoothInstrumentationTests

Change-Id: Ic729140b8ffb1273a9ca53cdfd39c9f5d71e1522
2021-02-20 05:50:03 +00:00
Andrew Cheng
8ef54b299e Make BluetoothConnectionCallback static
Tag: #refactor
Fixes: 180727461
Test: atest BluetoothInstrumentationTests
Change-Id: I4bd084cb6c0371b649adb1d1a65b3327ae3e488a
Merged-In: Id24a4b3a3510781d9105763b1722f44583a7fd7c
2021-02-19 18:50:20 +00:00
Joseph Pirozzo
f3bf66ac7a Add BluetoothMapClient to system API
Add BluetoothMapClient.sendMessage to system API for use by mainline
modules.

Bug: 157948464
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: Idee4cb2cefeaf03f0351ea576f919a294219d391
2021-02-19 07:39:07 -08:00
More Kuo
d1c7af46ca Update BluetoothA2dp API
- Rename setBufferMillis to setBufferLengthMillis
- Rename getCodec to forCodec

Bug: 179814567
Test: Build
Change-Id: Iadb1b9e2b42ecab98f70b8bf6500e7a97aaf0aab
2021-02-19 18:29:00 +08:00
Rahul Sabnis
626ffc2010 Skips the consent pairing dialog for recently associated CDM app and device combos because they have already been shown the CDM prompt which implicitly provides consent to bond.
Tag: #feature
Bug: 172006481
Test: Manual
Change-Id: I541b720c6b8b6e55be10e04f202e0a58cf33715f
2021-02-10 21:25:36 +00:00
Eugene Susla
6ce1f4109f [DO NOT MERGE] Scan and notify apps when their companion devices are nearby
Test: manual
Bug: 168052577
Change-Id: Ib2187fb76e604878b1d4dd9c0cd6cea610b2a04d
(cherry picked from commit 017c2c4145)
2021-02-08 22:50:57 +00:00
Jakub Pawlowski
25d2513d12 Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549914

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30ba05c835a01d0edf0ec7e9e3fbc75fccd12e92
2021-02-08 21:40:56 +00:00
Jakub Pawlowski
a42efdda60 Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549914

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29ebf878b030e8c18c08ceb545ea8e1b4a3026f
2021-02-08 20:53:22 +00:00
Łukasz Rymanowski
ebb62d5d58 Add Volume Control UUID
Sponsor: jpawlowski@
Test: compilation
Bug: 159786353
Tag: #feature

Change-Id: I14116848411026ceab0ee15098687bf821e74d38
2021-02-08 19:37:24 +00:00
Treehugger Robot
0a817569eb Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd am: 5a1c256180
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
2021-02-03 23:22:56 +00:00
Treehugger Robot
5a1c256180 Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80de479b73c6e8acb62c314ab25e2e93f5ed0669
2021-02-03 23:13:08 +00:00
Treehugger Robot
0f12a22aa6 Merge "AdvertiseData: fix nullable collection" 2021-02-03 19:10:59 +00:00
Jakub Pawlowski
d7f32dc5d9 Merge "resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1
2021-02-01 09:18:21 +00:00
Jakub Pawlowski
7cd99c47bb resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
2021-01-31 00:40:24 +01:00
Jakub Pawlowski
1b9358bfe6 docs: fix typo HDP->HFP in BluetoothHeadset
Bug: 158742305
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Iec48eba9a29e1cb7c2565e773ae876db662552ef
2021-01-29 09:21:00 +01:00
Kevin Hufnagle
633ec9f636 docs: Use correct profile for intent
The ACTION_AUDIO_STATE_CHANGED intent action uses the HDP profile,
not the A2DP profile.

Bug: 158742305
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I4358aac8c8aa9fc8b36e517e568e5a9db538555e
(cherry picked from commit fcd519fde9)
2021-01-29 09:16:33 +01:00
Adrian Roos
8b25bab292 AdvertiseData: fix nullable collection
Bug: 152525509
Test: make checkapi
Change-Id: Ia400cb2bda55b26594bc3a253612583134294edb
2021-01-28 18:54:38 +01:00
Automerger Merge Worker
88246ba80a Merge "Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27 am: 6b3d9261b0" into rvc-qpr-dev-plus-aosp am: d01a6469d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cb528c14b844821f5d4ac7b3501320dde25adb7
2021-01-21 19:21:53 +00:00
Zach Johnson
d313320f6b Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27 am: 6b3d9261b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74b1f32014f0ecb095b3e689e8b1cb1c62eb539f
2021-01-21 18:56:30 +00:00
Zach Johnson
75da9f9f27 Merge "Dynamic Audio Buffer (1/3)" 2021-01-21 17:28:17 +00:00
More Kuo
2883a293e8 Dynamic Audio Buffer (1/3)
Add APIs in BluetoothA2dp to:
1. Get the supported type of the dynamic audio buffer.
2. Get the dynamic audio buffer millis.
3. Set dynamic audio buffer millis.

Add BufferConstraints class to access the buffer millis of different
codec.

Bug: 163968696
Tag: #feature
Test: Run dynamic audio buffer test
Change-Id: If097d94be861dbb0c4d8f67fe7caf70a99093e34
2021-01-20 14:35:22 +08:00
Mathew Inwood
f3793ebcc9 Merge "Derestrict some non-SDK APIs." am: 29bf6e8443 am: 9e27f89092 am: 982e50f2c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab20c244c8ff5b04f3236cfccb453a4fbe5a8705
2021-01-13 10:34:26 +00:00
Mathew Inwood
982e50f2c6 Merge "Derestrict some non-SDK APIs." am: 29bf6e8443 am: 9e27f89092
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eeffeb0d9ab509e2f436435bf2079558e2d1c7d
2021-01-13 10:12:53 +00:00
Mathew Inwood
29bf6e8443 Merge "Derestrict some non-SDK APIs." 2021-01-13 09:38:35 +00:00
Jakub Pawlowski
f5376b1688 Merge "gatt: Allow to set eatt support" am: f04d2d58c2 am: 4fcde6c134 am: 2c4cbf33fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaba23fca7fc2deb64835f77153db07204d4c63f8
2021-01-12 03:40:04 +00:00
Jakub Pawlowski
2c4cbf33fa Merge "gatt: Allow to set eatt support" am: f04d2d58c2 am: 4fcde6c134
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cf8f907e6493cd4ee1b8e3867b41f88805a9ebd
2021-01-11 23:31:05 +00:00
Łukasz Rymanowski
9bf1c7c57c gatt: Allow to set eatt support
With this patch it is possible to enable eatt_support as a GATT Client
or GATT Server.

Tag: #feature
Bug: 159786353
Test: manually verified against device supporting EATT
Sponsor: jpawlowski@
Change-Id: I6835a2bbd1b0ab9d6d64ee2bac5dfc96c0563afd
2021-01-11 20:49:56 +01:00