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

Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev

Browse Source
This commit is contained in:
Alex Stetson
2021-02-26 20:37:24 +00:00
committed by Android (Google) Code Review
parent f0bd7906d0 e4dc456d4b
commit f8501da319
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -543,12 +543,13 @@ public class LocalBluetoothProfileManager {
mPbapProfile.setEnabled(device, true); mPbapProfile.setEnabled(device, true);
} }
if (mMapClientProfile != null) { if ((mMapClientProfile != null)
&& BluetoothUuid.containsAnyUuid(uuids, MapClientProfile.UUIDS)) {
profiles.add(mMapClientProfile); profiles.add(mMapClientProfile);
removedProfiles.remove(mMapClientProfile); removedProfiles.remove(mMapClientProfile);
} }
if ((mPbapClientProfile != null) && ArrayUtils.contains(localUuids, BluetoothUuid.PBAP_PCE) if ((mPbapClientProfile != null)
&& BluetoothUuid.containsAnyUuid(uuids, PbapClientProfile.SRC_UUIDS)) { && BluetoothUuid.containsAnyUuid(uuids, PbapClientProfile.SRC_UUIDS)) {
profiles.add(mPbapClientProfile); profiles.add(mPbapClientProfile);
removedProfiles.remove(mPbapClientProfile); removedProfiles.remove(mPbapClientProfile);

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
View File

@@ -47,8 +47,6 @@ public final class MapClientProfile implements LocalBluetoothProfile {
private final LocalBluetoothProfileManager mProfileManager; private final LocalBluetoothProfileManager mProfileManager;
static final ParcelUuid[] UUIDS = { static final ParcelUuid[] UUIDS = {
BluetoothUuid.MAP,
BluetoothUuid.MNS,
BluetoothUuid.MAS, BluetoothUuid.MAS,
}; };