Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,553 Commits 3 Branches 0 Tags
44a90fb12319ef5d25e01df837a2ee5cd84c8bb4
Commit Graph

2001 Commits

Author SHA1 Message Date
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
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
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
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
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
Jakub Pawlowski
3bb83023a8 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I73e4f7e156ee701c3587ef9667d6c7c03dbe8363
 2021-10-14 07:22:16 +00:00
Jakub Pawlowski
488d8f2060 Merge changes If0e5861e,Ib385b24d 
* changes:
  leaudio: Add missing context types
  leaudio: Add API to add/remove group node
 2021-10-14 07:03:31 +00:00
Jakub Pawlowski
2f8032fd8b Merge "bluetooth: Fix common typo" 2021-10-14 06:59:51 +00:00
Jakub Pawlowski
6f82402e5c Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I9fc8afb137b57f890655fa6ce9254a4e39375110
 2021-10-13 22:37:03 +00:00
Grzegorz Kołodziejczyk
b92392dff9 leaudio: Add missing context types 
BYPASS_INCLUSIVE_LANGUAGE_REASON=exact wording for constant from BT specification
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: compile
Change-Id: If0e5861e882636afba6a29c0ae34362d179035ea
 2021-10-13 21:59:29 +00:00
Łukasz Rymanowski
ef061e6a00 bluetoothUuid: Add placeholder for CAP uuid 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: I69a9cb6a341d42eff3e5ae92d9c99ab5fa3bf9a3
 2021-10-13 14:11:52 +00:00
Łukasz Rymanowski
6c3fc79d87 leaudio: Add API to add/remove group node 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Ib385b24d6b10754d9cadea2363e81c78b4382a44
 2021-10-13 11:39:29 +00:00
Łukasz Rymanowski
27064f0bcf bluetooth: Fix common typo 
sponsor: jpawlowski@
test: NA

Change-Id: I0e93b87371f434c229f211c480727cc26434a5e0
 2021-10-13 07:55:26 +00:00
Jakub Pawlowski
0eeb6b7018 Merge "leaudio: Remove not needed group status" am: 6e897f9eb6 am: bea8d8d265 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850202

Change-Id: Ic0a9be6ac13f509fc18baad5981a60eab284caa6
 2021-10-10 11:47:58 +00:00
Jakub Pawlowski
3bd961ea30 Merge "leaudio: Add set volume API" am: b49456ff77 am: 05dd4fbc03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850201

Change-Id: I89a2b91ec79917a7ba2c8a7cba58682210ec9657
 2021-10-10 09:14:29 +00:00
Jakub Pawlowski
8f9b42c0c4 Merge changes I7782f95c,I7e553bd9 am: b6cf963be9 am: 5e7527dbd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850200

Change-Id: Iecd48efe35525998123bf6548602dc9773c53c7f
 2021-10-09 07:44:35 +00:00
Łukasz Rymanowski
60466ee623 leaudio: Remove not needed group status 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Id9145e6e2631d0eae102bcc502ae4aa233b61d7b
 2021-10-08 21:59:05 +00:00
Łukasz Rymanowski
bc3859a482 leaudio: Add set volume API 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Icb2e7681e4b5e7ba2e796671ff6f4c59bbff29d7
 2021-10-08 21:59:04 +00:00
Łukasz Rymanowski
9a745d0f01 leaudio: Fix link to intent 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: I7782f95cca7478dcd585d435f585bba6a453f1ab
 2021-10-08 21:08:50 +00:00
Łukasz Rymanowski
42ee6a1e29 leaudio: update UUID 
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: I7e553bd9ffec52c1a2f70e80a194ad7214fe905a
 2021-10-08 21:08:50 +00:00
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