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

Commit 80e13d59 authored by Chienyuan's avatar Chienyuan Committed by android-build-merger
Browse files

Merge "Support PBAP for get/close profile proxy" 

am: 3e3f8bc0

Change-Id: I816c0cf96fbe59b74c94ecfb4221cc92067ba537
parents e2e6bdf3 3e3f8bc0

core/java/android/bluetooth/BluetoothAdapter.java

+7 −0
Original line number Diff line number Diff line
@@ -2670,6 +2670,9 @@ public final class BluetoothAdapter { 
        } else if (profile == BluetoothProfile.PAN) {

            BluetoothPan pan = new BluetoothPan(context, listener);

            return true;

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

            BluetoothPbap pbap = new BluetoothPbap(context, listener);

            return true;

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

            Log.e(TAG, "getProfileProxy(): BluetoothHealth is deprecated");

            return false;
@@ -2742,6 +2745,10 @@ public final class BluetoothAdapter { 
                BluetoothPan pan = (BluetoothPan) proxy;

                pan.close();

                break;

            case BluetoothProfile.PBAP:

                BluetoothPbap pbap = (BluetoothPbap) proxy;

                pbap.close();

                break;

            case BluetoothProfile.GATT:

                BluetoothGatt gatt = (BluetoothGatt) proxy;

                gatt.close();