Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14bb3b42 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

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

Bug: 191935916
Test: Manual
Merged-In: Ia46dc4e50d42dbd574588b531045cb680aa09d94
Change-Id: I728cdd4e60dcb753a9a688b4c5b5c2a89db50fce
parents 9278453b 6041a066

core/java/android/bluetooth/BluetoothAdapter.java

+7 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,9 @@ public final class BluetoothAdapter { 
                return true;

            }

            return false;

        } else if (profile == BluetoothProfile.LE_AUDIO) {

            BluetoothLeAudio leAudio = new BluetoothLeAudio(context, listener, this);

            return true;

        } else if (profile == BluetoothProfile.VOLUME_CONTROL) {

            BluetoothVolumeControl vcs = new BluetoothVolumeControl(context, listener, this);

            return true;
@@ -3146,6 +3149,10 @@ public final class BluetoothAdapter { 
                BluetoothHearingAid hearingAid = (BluetoothHearingAid) proxy;

                hearingAid.close();

                break;

            case BluetoothProfile.LE_AUDIO:

                BluetoothLeAudio leAudio = (BluetoothLeAudio) proxy;

                leAudio.close();

                break;

            case BluetoothProfile.VOLUME_CONTROL:

                BluetoothVolumeControl vcs = (BluetoothVolumeControl) proxy;

                vcs.close();