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

Commit 4c7123f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix missing connection state changes intent for Hearing Aids"

parents c4b64745 3b24d971

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+8 −7
Original line number Diff line number Diff line
@@ -128,6 +128,14 @@ public class LocalBluetoothProfileManager { 


        ParcelUuid[] uuids = adapter.getUuids();



        List<Integer> supportedList = mLocalAdapter.getSupportedProfiles();

        if (supportedList.contains(BluetoothProfile.HEARING_AID)) {

            mHearingAidProfile = new HearingAidProfile(mContext, mLocalAdapter, mDeviceManager,

                                                       this);

            addProfile(mHearingAidProfile, HearingAidProfile.NAME,

                       BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);

        }



        // uuids may be null if Bluetooth is turned off

        if (uuids != null) {

            updateLocalProfiles(uuids);
@@ -164,13 +172,6 @@ public class LocalBluetoothProfileManager { 
        addProfile(mPbapProfile, PbapServerProfile.NAME,

             BluetoothPbap.ACTION_CONNECTION_STATE_CHANGED);



        List<Integer> supportedList = mLocalAdapter.getSupportedProfiles();

        if (supportedList.contains(BluetoothProfile.HEARING_AID)) {

            mHearingAidProfile = new HearingAidProfile(mContext, mLocalAdapter, mDeviceManager,

                                                       this);

            addProfile(mHearingAidProfile, HearingAidProfile.NAME,

                       BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");

    }