Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 6041a06620 to sc-dev-plus-aosp

Browse Source 
Bug: 191935916
Test: Manual
Merged-In: Ia46dc4e50d42dbd574588b531045cb680aa09d94
Change-Id: I728cdd4e60dcb753a9a688b4c5b5c2a89db50fce
This commit is contained in:
Rahul Sabnis
2021-06-24 04:49:34 +00:00
parent 9278453be1 6041a06620
commit 14bb3b4267
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -3054,6 +3054,9 @@ public final class BluetoothAdapter {
return true; return true;
} }
return false; return false;
} else if (profile == BluetoothProfile.LE_AUDIO) {
BluetoothLeAudio leAudio = new BluetoothLeAudio(context, listener, this);
return true;
} else if (profile == BluetoothProfile.VOLUME_CONTROL) { } else if (profile == BluetoothProfile.VOLUME_CONTROL) {
BluetoothVolumeControl vcs = new BluetoothVolumeControl(context, listener, this); BluetoothVolumeControl vcs = new BluetoothVolumeControl(context, listener, this);
return true; return true;
@@ -3146,6 +3149,10 @@ public final class BluetoothAdapter {
BluetoothHearingAid hearingAid = (BluetoothHearingAid) proxy; BluetoothHearingAid hearingAid = (BluetoothHearingAid) proxy;
hearingAid.close(); hearingAid.close();
break; break;
case BluetoothProfile.LE_AUDIO:
BluetoothLeAudio leAudio = (BluetoothLeAudio) proxy;
leAudio.close();
break;
case BluetoothProfile.VOLUME_CONTROL: case BluetoothProfile.VOLUME_CONTROL:
BluetoothVolumeControl vcs = (BluetoothVolumeControl) proxy; BluetoothVolumeControl vcs = (BluetoothVolumeControl) proxy;
vcs.close(); vcs.close();