PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for Multi-A2DP state machines per device" am: e61ac8ec02

Browse Source 
am: a84302f194

Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03
This commit is contained in:
Pavlin Radoslavov
2018-01-27 00:02:16 +00:00
committed by android-build-merger
parent 718af4ba73 a84302f194
commit 47a2c27af1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -1876,7 +1876,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
synchronized (mBluetoothA2dpLock) { synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) { if (mBluetoothA2dp != null) {
codecStatus = mBluetoothA2dp.getCodecStatus(); codecStatus = mBluetoothA2dp.getCodecStatus(null); // Use current active device
if (codecStatus != null) { if (codecStatus != null) {
codecConfig = codecStatus.getCodecConfig(); codecConfig = codecStatus.getCodecConfig();
codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities(); codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
@@ -2095,14 +2095,14 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
case 6: case 6:
synchronized (mBluetoothA2dpLock) { synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) { if (mBluetoothA2dp != null) {
mBluetoothA2dp.enableOptionalCodecs(); mBluetoothA2dp.enableOptionalCodecs(null); // Use current active device
} }
} }
return; return;
case 7: case 7:
synchronized (mBluetoothA2dpLock) { synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) { if (mBluetoothA2dp != null) {
mBluetoothA2dp.disableOptionalCodecs(); mBluetoothA2dp.disableOptionalCodecs(null); // Use current active device
} }
} }
return; return;
@@ -2225,7 +2225,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
synchronized (mBluetoothA2dpLock) { synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) { if (mBluetoothA2dp != null) {
mBluetoothA2dp.setCodecConfigPreference(codecConfig); // Use current active device
mBluetoothA2dp.setCodecConfigPreference(null, codecConfig);
} }
} }
} }