Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_packages_modules_Bluetooth
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

e20a4c63

Commit e20a4c63 authored 1 year ago by Sal Savage Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge changes I06b0847b,I501b345c,Ifead6790,I3b65b38e into main am: dbb8e0a8 am: 7e7e8b51

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2974024

Change-Id: Ie526e4d8264e8968244fe2827ba9fba85f1afd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cc22d2b1 7e7e8b51

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp 28 additions, 0 deletions

...pp/jni/com_android_bluetooth_btservice_AdapterService.cpp
android/app/src/com/android/bluetooth/BluetoothEventLogger.java 1 addition, 8 deletions

...d/app/src/com/android/bluetooth/BluetoothEventLogger.java
android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java 5 additions, 1 deletion

.../app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java 2 additions, 2 deletions

...src/com/android/bluetooth/audio_util/MediaPlayerList.java
android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java 0 additions, 1 deletion

...p/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java 2 additions, 2 deletions

...p/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
android/app/src/com/android/bluetooth/bass_client/BassClientService.java 19 additions, 29 deletions

.../com/android/bluetooth/bass_client/BassClientService.java
android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java 5 additions, 2 deletions

...pp/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java 10 additions, 23 deletions

...rc/com/android/bluetooth/mcp/MediaControlGattService.java
android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java 10 additions, 17 deletions

...pp/src/com/android/bluetooth/mcp/MediaControlProfile.java
android/app/src/com/android/bluetooth/tbs/TbsGatt.java 2 additions, 2 deletions

android/app/src/com/android/bluetooth/tbs/TbsGatt.java
android/app/tests/unit/src/com/android/bluetooth/opp/TestActivity.java 3 additions, 3 deletions

...ests/unit/src/com/android/bluetooth/opp/TestActivity.java

with 87 additions and 90 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment