Commit Graph

1946 Commits

Author SHA1 Message Date
Martin Brabham
2cc10ccfea Merge "Add implementation for IRK to parcelable functions." am: 400c21483c am: 234cdb9d8a am: a2657cf70a am: a31665ab13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780808

Change-Id: I4bd36252ad569539b3b902a2e788d42ad5cf44e2
2021-07-30 00:24:38 +00:00
Martin Brabham
a31665ab13 Merge "Add implementation for IRK to parcelable functions." am: 400c21483c am: 234cdb9d8a am: a2657cf70a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780808

Change-Id: I7aafcd520517394a290a49a42034468d9ca72e7e
2021-07-30 00:16:07 +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
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
97fcfce7b5 Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9 am: 7d712166f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294

Change-Id: Ie3c2a12af89647171f7925aa6bb85d57dd67a92f
2021-07-29 15:52:19 +00:00
Rahul Sabnis
91789e45ec Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev am: 7a3cb23bf9 am: 339b2e4e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404294

Change-Id: Iec19374f348d80cd43d93efa87fc7ebaca9f2542
2021-07-28 22:28:51 +00: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
ba731e3676 Merge "Prevent create bond for null MAC address" am: b0c01df940 am: 8d313940b0 am: 982531f1dd am: 9c415d5b90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776317

Change-Id: I7d56979daaefe194897b3fd647d4d4cc46ddc911
2021-07-28 19:03:58 +00:00
Jakub Pawlowski
9c415d5b90 Merge "Prevent create bond for null MAC address" am: b0c01df940 am: 8d313940b0 am: 982531f1dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776317

Change-Id: I82b1ff5730af45af0a6a6a27b216a375ca84bd8e
2021-07-28 18:51:03 +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
162c6b0147 Merge "Unify the mismatch in the byte order of the address." into sc-dev am: e664dec81d am: 08e5913a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15339447

Change-Id: I219694585d7436e52082f18d3d728ed6a71d6553
2021-07-22 18:29:22 +00:00
TreeHugger Robot
0a8c768e65 Merge "Unify the mismatch in the byte order of the address." into sc-dev am: e664dec81d am: 90060aa8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15339447

Change-Id: Icac5788bc453ac6b81af9ce01ac204fd727b1618
2021-07-22 18:25:44 +00: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
00193cb288 Merge changes from topic "cherrypick-BT-result-storage-descriptor-remove-t1jhhedypv" into sc-dev-plus-aosp am: f4c0d7097c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15278137

Change-Id: I2764646b0f0a5b4f811defb5b2d8dbc285fd971f
2021-07-14 18:08:44 +00:00
Jakub Pawlowski
a0b71959f9 Get rid of ResultStorageDescriptor in startScan am: 374836844e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283102

Change-Id: I0e7a4c5dfc31d3059e51270f0a90d6c815312ce4
2021-07-14 18:08:39 +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
Jakub Pawlowski
079f0dfb20 Merge changes from topic "BT-result-storage-descriptor-remove"
* changes:
  Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
  Get rid of ResultStorageDescriptor in startScan
2021-07-14 08:56:38 +00:00
Jakub Pawlowski
b7c6be2c76 Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
It's not used anywhere, and the implementation actually never do
anything.

Bug: 192615539
Change-Id: Icf8906c972cf18d65a22d30c3a628fd54db59179
2021-07-13 22:05:45 +02:00
Jakub Pawlowski
858d35f509 Get rid of ResultStorageDescriptor in startScan
It's never used

Bug: 192615539
Change-Id: Ia2d65def69b13150a20e8a2077c3fe630f8ec86e
2021-07-13 22:05:05 +02:00
Johanna Ye
cfa6f14403 Merge "Fix long characteristic write concurrency bug." 2021-07-09 15:39:32 +00:00
Johanna Ye
fb6f5ac6e7 Merge "Fix long characteristic write concurrency bug." into sc-dev-plus-aosp am: dad2385daf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15105259

Change-Id: Id96e9b0b86cbe03b4f086329096ac770aca5afd9
2021-07-09 12:18:09 +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
c4c0b6251b Merge "Tag some "new Binder()" instances to detect leaks." into sc-dev am: c8955e0799 am: 7da4e4c89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225384

Change-Id: I74e95d4f14d80e92405a5fc872978540838f5888
2021-07-08 00:58:51 +00:00
TreeHugger Robot
05d6c2b79a Merge "Tag some "new Binder()" instances to detect leaks." into sc-dev am: c8955e0799 am: 7b41a7b17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225384

Change-Id: I23a82fd99bc697285ae2ab9436e9f711f57c7c23
2021-07-08 00:50:18 +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
Jeff Sharkey
79b834d47c Tag some "new Binder()" instances to detect leaks.
We've seen evidence of a Binder leak, and our hunch is that it's
caused by one of these anonymous "new Binder()" sites.  Adding
descriptors will help us identify the leak cause.

Bug: 192415943
Test: atest BluetoothInstrumentationTests
Change-Id: I30cd15f084cf50f67edd833b27b853c4b22e1db1
2021-07-07 17:17:07 -06:00
Rahul Sabnis
97a9e05dac Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 301ad0c728 am: bd5568f800 am: f85699dc0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: Iabcd961878192216aa4c8ac7c62180b7a92cc230
2021-07-02 22:45:26 +00:00
Rahul Sabnis
f85699dc0f Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 301ad0c728 am: bd5568f800
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: Idb7e0d7d4b5ddafe9f461851655e2b01693eeecf
2021-07-02 22:32:05 +00:00
Rahul Sabnis
bd5568f800 Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 301ad0c728
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: I3c67ce35ae5c26ff497365fb3ab683474e2b4b69
2021-07-02 22:31:26 +00:00
Johanna Ye
37343d1d6e Fix long characteristic write concurrency bug.
Tag: #stability
Test: ADT3 with test app
Bug: 169559728
Ignore-AOSP-First: Current security annotation parity

Merged-In: I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1
Change-Id: I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1
2021-07-02 10:44:42 +00:00
Etienne Ruffieux
5e3a79e1d6 Update BluetoothAdapter and BluetoothDevice documentation
Update BluetoothAdapter#startDiscovery and
BluetoothDevice#fetchUuidsWithSdp documentation to
indicate that it queues the request if a device is
currently bonding

Tag: #feature
Bug: 187165224
Test: Manual
Merged-In: I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f
Change-Id: I7e598417ba96a5acc9f13fb6d29a0612740f31b4
2021-07-01 22:39:36 +00:00
Rahul Sabnis
d748e6ec7a Update BluetoothAdapter and BluetoothDevice documentation
Update BluetoothAdapter#startDiscovery and
BluetoothDevice#fetchUuidsWithSdp documentation to
indicate that it queues the request if a device is
currently bonding

Tag: #feature
Bug: 187165224
Test: Manual
Change-Id: I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f
2021-07-01 22:36:56 +00:00
Johanna Ye
9eeafe9d52 Fix long characteristic write concurrency bug.
Tag: #stability
Test: Bramble (pixel phone) with test app
Bug: 169559728
Ignore-AOSP-First: Current security annotation parity
Merged-In: I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1

Change-Id: Ia2d821c5d34d8d035fbbb0b33b9bf4fc8c08b354
2021-07-01 10:51:03 +02:00
Johanna Ye
19734ef448 Merge "Fix long characteristic write concurrency bug." 2021-06-30 14:21:59 +00:00
Johanna Ye
4e2056b367 Merge "Add synchronization to all mDeviceBusy state changes." am: 744e835c40 am: 8e9787fdb1 am: 7bd3fa33dc am: 2ca11a0ebe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751221

Change-Id: I2aa83d3dc16e4d60efc22a62eb7421da6318f68b
2021-06-29 20:16:03 +00:00
Johanna Ye
2ca11a0ebe Merge "Add synchronization to all mDeviceBusy state changes." am: 744e835c40 am: 8e9787fdb1 am: 7bd3fa33dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751221

Change-Id: Ie7fe3c1f90149a818ca14711cf6128b4e08dbcdb
2021-06-29 20:03:43 +00:00
Johanna Ye
7bd3fa33dc Merge "Add synchronization to all mDeviceBusy state changes." am: 744e835c40 am: 8e9787fdb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751221

Change-Id: I3ecb6ae4c51c4a843be0eb265825966c8afb42ae
2021-06-29 19:43:02 +00:00
Johanna Ye
e36f798dea Add synchronization to all mDeviceBusy state changes.
Tag: #stability
Test: make
Bug: 169559728
Change-Id: I5c1b926a4c774b4bc5f24a9aaa66aa5f7780e121
2021-06-29 16:19:53 +02:00
Johanna Ye
3fd335f4de Fix long characteristic write concurrency bug.
Tag: #stability
Test: Bramble (pixel phone) with test app
Bug: 169559728
Ignore-AOSP-First: Current security annotation parity
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1
2021-06-29 16:14:53 +02:00
Rahul Sabnis
14bb3b4267 resolve merge conflicts of 6041a06620 to sc-dev-plus-aosp
Bug: 191935916
Test: Manual
Merged-In: Ia46dc4e50d42dbd574588b531045cb680aa09d94
Change-Id: I728cdd4e60dcb753a9a688b4c5b5c2a89db50fce
2021-06-24 04:52:56 +00:00
Rahul Sabnis
a8d3435cfd Add BluetoothLeAudio to BluetoothAdapter#getProfileProxy and
BluetoothAdapter#closeProfileProxy

Tag: #feature
Bug: 15083918
Test: Manual
Merged-In: Ia46dc4e50d42dbd574588b531045cb680aa09d94
Change-Id: Ia46dc4e50d42dbd574588b531045cb680aa09d94
2021-06-23 23:46:43 +00:00
Rahul Sabnis
5a623c1a6d Add BluetoothLeAudio to BluetoothAdapter#getProfileProxy and
BluetoothAdapter#closeProfileProxy

Tag: #feature
Bug: 15083918
Test: Manual
Change-Id: Ia46dc4e50d42dbd574588b531045cb680aa09d94
2021-06-23 16:10:07 -07:00