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

Commit 22e174a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Configure Bluetooth profiles displayed in settings"

parents bb124969 f87daf40

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

+3 −2
Original line number Diff line number Diff line
@@ -543,12 +543,13 @@ public class LocalBluetoothProfileManager { 
            mPbapProfile.setEnabled(device, true);

        }



        if (mMapClientProfile != null) {

        if ((mMapClientProfile != null)

                && BluetoothUuid.containsAnyUuid(uuids, MapClientProfile.UUIDS)) {

            profiles.add(mMapClientProfile);

            removedProfiles.remove(mMapClientProfile);

        }



        if ((mPbapClientProfile != null) && ArrayUtils.contains(localUuids, BluetoothUuid.PBAP_PCE)

        if ((mPbapClientProfile != null)

                && BluetoothUuid.containsAnyUuid(uuids, PbapClientProfile.SRC_UUIDS)) {

            profiles.add(mPbapClientProfile);

            removedProfiles.remove(mPbapClientProfile);

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

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
    private final LocalBluetoothProfileManager mProfileManager;



    static final ParcelUuid[] UUIDS = {

        BluetoothUuid.MAP,

        BluetoothUuid.MNS,

        BluetoothUuid.MAS,

    };