Commit Graph

2108 Commits

Author SHA1 Message Date
Treehugger Robot
b76a7f7f1d Merge "BluetoothAdapter: Extend getActiveDevice with LeAudio" am: a8c0faa120 am: f1fecf587c am: c1f3da3748 am: 7ef1545a4c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890537

Change-Id: Id4f689d756d9db31ae93d9a13f7bbe886fba2719
2021-11-12 20:44:07 +00:00
Treehugger Robot
7ef1545a4c Merge "BluetoothAdapter: Extend getActiveDevice with LeAudio" am: a8c0faa120 am: f1fecf587c am: c1f3da3748
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890537

Change-Id: I86995e90655264fa7ac5920f65dd7d159bdf49c2
2021-11-12 20:31:44 +00:00
Łukasz Rymanowski
428a73b153 BluetoothAdapter: Extend getActiveDevice with LeAudio
Bug: 150670922
Sponsor: jpawlowski@
Test: NA

Change-Id: I82662de5fe7f86b28dee1edff38761cf48343c5a
2021-11-12 14:25:41 +00:00
Rahul Sabnis
b22dd98d18 Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." am: eb806924d6 am: f9960bd169 am: c59fe0168f am: e00ce9b39a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858070

Change-Id: I5ae27882a985d71ef694739993e29605235a6197
2021-11-05 19:00:17 +00:00
Rahul Sabnis
eb806924d6 Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." 2021-11-05 05:13:01 +00:00
Rahul Sabnis
8e78d9fbf3 Deprecate GATT callbacks and methods that were not memory safe and
replace with memory safe versions.

Tag: #feature
Bug: 195157393
Test: Manual
CTS-Coverage-Bug: 205190062
Merged-In: I5ae604ec20febcf646bfe6a8f866b218448349c1
Change-Id: I5ae604ec20febcf646bfe6a8f866b218448349c1
2021-11-05 03:30:03 +00:00
Rahul Sabnis
3901dc6bf3 Deprecate GATT callbacks and methods that were not memory safe and
replace with memory safe versions.

Tag: #feature
Bug: 195157393
Test: Manual
CTS-Coverage-Bug: 205190062
Change-Id: I5ae604ec20febcf646bfe6a8f866b218448349c1
2021-11-04 17:26:10 -07:00
Bill Yi
ba584f1fa1 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
2021-11-02 21:07:53 -07:00
Treehugger Robot
9c3ac61073 Merge "Rectify comment in getCurrentAgEvents" am: a1219366ac am: 35c23c8ba7 am: bd3ade8553 am: 31f8821836 am: d792f5f5b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842099

Change-Id: If581681d04749e74848c4a8505701ef7973960d1
2021-10-29 21:09:48 +00:00
Treehugger Robot
d792f5f5b1 Merge "Rectify comment in getCurrentAgEvents" am: a1219366ac am: 35c23c8ba7 am: bd3ade8553 am: 31f8821836
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842099

Change-Id: I5cdedeb0445a90f9739a9c335d0d1c01011de6d8
2021-10-29 20:55:25 +00:00
Treehugger Robot
bd3ade8553 Merge "Rectify comment in getCurrentAgEvents" am: a1219366ac am: 35c23c8ba7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842099

Change-Id: I732e004762c8846eddc353eeb6c8a7f801b4c57d
2021-10-29 20:36:51 +00:00
Treehugger Robot
a1219366ac Merge "Rectify comment in getCurrentAgEvents" 2021-10-29 20:01:35 +00:00
Treehugger Robot
318be1a431 Merge "Expose isCISCentralSupported() and isLePeriodicAdvertisingSyncTransferSenderSupported() API" am: 29f37405b0 am: 61d4e7ca47 am: fd2248fca7 am: 7b7621a489 am: da8229a6ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860616

Change-Id: I0a20b33910e0a0584be97bda929997508e692ba0
2021-10-28 07:30:19 +00:00
Treehugger Robot
da8229a6ac Merge "Expose isCISCentralSupported() and isLePeriodicAdvertisingSyncTransferSenderSupported() API" am: 29f37405b0 am: 61d4e7ca47 am: fd2248fca7 am: 7b7621a489
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860616

Change-Id: I41fb07fbcb3d3a2c2f03ca0ae3b991b01afcec70
2021-10-28 07:11:27 +00:00
Treehugger Robot
fd2248fca7 Merge "Expose isCISCentralSupported() and isLePeriodicAdvertisingSyncTransferSenderSupported() API" am: 29f37405b0 am: 61d4e7ca47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860616

Change-Id: I9c55d5c860f1bb547fc5471feefe8316c53afb4c
2021-10-28 06:36:27 +00:00
Treehugger Robot
29f37405b0 Merge "Expose isCISCentralSupported() and isLePeriodicAdvertisingSyncTransferSenderSupported() API" 2021-10-28 06:00:43 +00:00
TreeHugger Robot
1c22830676 Merge "Group CSIP device based on CAP" 2021-10-27 15:30:41 +00:00
Patty
0b5f026f12 Expose isCISCentralSupported() and isLePeriodicAdvertisingSyncTransferSenderSupported() API
Tag: #feature
Bug: 200749925
Bug: 150670922
Test: Compile
Change-Id: I45c674dcc8719d209f0e790aa9716bbbf0052fce
2021-10-27 13:51:40 +08:00
Alice Kuo
436bffbdf0 Group CSIP device based on CAP
Enable device group based on CAP for testing, the uuid value would be changed after
the specification published.

Bug: 150670922
Bug: 178981521
Test: pair with the LE audio coordinated set, and make sure it works

Change-Id: Ia3d0dbe496dec822fee8ae6465b81688b9e9440c
2021-10-27 11:03:39 +08:00
Treehugger Robot
18a9d6bd0c Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4 am: 50ccf0437f am: 063a4aa8dd am: 0c0911fad0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869978

Change-Id: I0148ca062998af9eb87545b562966b510b8de8b9
2021-10-26 23:56:38 +00:00
Treehugger Robot
0c0911fad0 Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4 am: 50ccf0437f am: 063a4aa8dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869978

Change-Id: Icd2a198893c78bcc6c5991afaca4c733489f6712
2021-10-26 23:35:42 +00:00
Treehugger Robot
50ccf0437f Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869978

Change-Id: I4ad9815b55742305007388054eb34397de03cb4d
2021-10-26 22:46:13 +00:00
Treehugger Robot
6f1b7122f3 Merge "Renamed getTimeStamp to getTimestampMillis and added docs." 2021-10-26 21:47:39 +00:00
Treehugger Robot
bbd05d765e Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079 am: 170597987c am: fddbf6e930 am: 92bf843da4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: Ib926a6c45bead4e50de93a371b97bfadad2a9fb0
2021-10-26 16:39:19 +00:00
Treehugger Robot
92bf843da4 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079 am: 170597987c am: fddbf6e930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: I162c539a488e0977817a259098ef83694879fcf4
2021-10-26 16:27:38 +00:00
Treehugger Robot
170597987c Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: Ic29bd0608b8a1edafc30834889f99107a5bfb9da
2021-10-26 15:58:18 +00:00
Etienne Ruffieux
7cc7453179 Renamed getTimeStamp to getTimestampMillis and added docs.
Tag: #feature
Test: Manual
Bug: 204179568
Change-Id: Ibea9f98eb25447e7ca3a07310615d14caf2c8aa1
2021-10-26 15:52:10 +00:00
Treehugger Robot
168b5655a4 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" 2021-10-26 15:32:33 +00:00
Etienne Ruffieux
255c70fbbc Revert "Removed BluetoothDevice#prepareToEnterProcess"
This reverts commit e8f2077fee.

Reason for revert: Introducing regression for gms core

Test: None
Change-Id: I644b10c1869c12e1622300de43bfbdb57fb583d8
2021-10-25 21:42:17 +00:00
Treehugger Robot
c898a4bd43 Merge "Replaced BitUtils#maskedEquals hidden API call" am: 3d4a7e57fe am: f1d8cbb46c am: 395496ff6a am: 49832ec945 am: e7ccfccd7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868764

Change-Id: I87dc103d79d2fbf63e2653f85575a9ad1161f356
2021-10-25 18:55:33 +00:00
Treehugger Robot
e7ccfccd7d Merge "Replaced BitUtils#maskedEquals hidden API call" am: 3d4a7e57fe am: f1d8cbb46c am: 395496ff6a am: 49832ec945
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868764

Change-Id: Ib0f2d18e36f2184ca5748c3f114d8d30a9b8dee9
2021-10-25 18:41:49 +00:00
Treehugger Robot
395496ff6a Merge "Replaced BitUtils#maskedEquals hidden API call" am: 3d4a7e57fe am: f1d8cbb46c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1868764

Change-Id: I485eb2e7a1005edc10deb0db803c9d98573dc18c
2021-10-25 18:16:07 +00:00
Treehugger Robot
3d4a7e57fe Merge "Replaced BitUtils#maskedEquals hidden API call" 2021-10-25 17:45:14 +00:00
Etienne Ruffieux
b46a54d2e8 Replaced BitUtils#maskedEquals hidden API call
Added maskedEquals method to BluetoothLeUtils to prevent
hidden API usage.

Tag: #feature
bug: 200200870
Test: Manual
Change-Id: I7517cfef0b9e058e36d8d325f4a5ec653b1f804b
2021-10-25 17:41:44 +00:00
Rahul Sabnis
b2d01e4d5f Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 am: f91171d35e am: 6f74b5dd8b am: 01eb71be00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: I69db1ef2bbb305ee5b6839f763ad1abb867b0f97
2021-10-25 17:31:41 +00:00
Rahul Sabnis
01eb71be00 Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 am: f91171d35e am: 6f74b5dd8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: I9e271a266c640fb739a5c394d0f5d091803143f4
2021-10-25 17:24:00 +00:00
Rahul Sabnis
f91171d35e Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: Id4834acb7d38f9bd98e1eb29b9be0636a2f27a73
2021-10-25 16:53:04 +00:00
Rahul Sabnis
a12c77ab44 Merge "Adding @SystemApi annotation to Bluetooth energy stats." 2021-10-25 16:21:35 +00:00
Harshad Ulhas Dhabu
55750ca1df Rectify comment in getCurrentAgEvents
Bug: 143946839
Bug: 199827901
Test: IOP and BCST
Tag: #refactor
Change-Id: I1c91d941f5383e8682e2b664120ffe6de4dfdef4
(cherry picked from commit 8d4c5fbf98e7d44cb9367c2d8b05bbd56ac9f3ae)
2021-10-25 04:48:50 +00:00
Etienne Ruffieux
d372361fe3 Adding @SystemApi annotation to Bluetooth energy stats.
Added @SystemApi annotation to BluetoothActivityEnergyInfo
and UidTraffic getters for mainline compatibility. Replaced
raw array by List. Deleted unused constructors.

Tag: #feature
Bug: 200201373
Test: Manual
Change-Id: Id93215f48bf08d31ac269af9e064cf598f50b6d3
2021-10-21 20:39:31 +00:00
Treehugger Robot
54a244fe79 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1 am: 5ee34126e5 am: 47b3a1d69e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Iec726bee182e3cee35df1288ca2206582ca63420
2021-10-18 22:52:41 +00:00
Treehugger Robot
47b3a1d69e Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1 am: 5ee34126e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: I3c09d03f89dc70363dca395c677a27b77c1bf708
2021-10-18 22:33:58 +00:00
Treehugger Robot
881188aec1 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Icfb47bbfd6a04323343d93cc4a7f636bc6c1f280
2021-10-18 22:05:26 +00:00
Treehugger Robot
e722500621 Merge "Removed BluetoothDevice#prepareToEnterProcess" 2021-10-18 21:37:57 +00:00
Etienne Ruffieux
e8f2077fee Removed BluetoothDevice#prepareToEnterProcess
Tag: #feature
Bug: 200202780
Test: manual
Change-Id: I8d4be1da1bcb5b819c324f1a3a89c7dc317c31d6
2021-10-15 14:41:32 +00:00
Jakub Pawlowski
87585ba0fd Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab am: be7af2bacb am: 48a3a95135
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: I6f8965c28b5507635a2f8bb99b5250f047d4f9c0
2021-10-14 08:17:43 +00:00
Jakub Pawlowski
a91e4dec64 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8 am: a7d42cae3e am: d66aa55784
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I338850a251dee63c11aeca015e6d3f4b051e8e4f
2021-10-14 08:16:32 +00:00
Jakub Pawlowski
48a3a95135 Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab am: be7af2bacb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: I71872dc73a525439e922fc5ffe2f488d152b0f6d
2021-10-14 07:55:58 +00:00
Jakub Pawlowski
d66aa55784 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8 am: a7d42cae3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I3c1aab5c74cc8ca90414be56d4c86daf8305d5d3
2021-10-14 07:55:25 +00:00
Jakub Pawlowski
aa84ebeaab Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: Ibf8cd5b410535711c1f3842b02dedc7826843488
2021-10-14 07:22:43 +00:00