commit 47a2c27af13252ed4f2ffc0a6a7c83ab8f85f99f
author Pavlin Radoslavov <pavlin@google.com> Sat Jan 27 00:02:16 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 27 00:02:16 2018 +0000
tree 22aad9ee0a5cd1098da57d485d20e6f448aba468
parent 718af4ba737560744f5c48ea8e6192a02042d551
parent a84302f1942fea0d43c0186b196f88211ee4a6b8

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

Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03

src/com/android/settings/development/DevelopmentSettings.java

diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 8831d23..ff5bc18 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -1876,7 +1876,7 @@
 
         synchronized (mBluetoothA2dpLock) {
             if (mBluetoothA2dp != null) {
-                codecStatus = mBluetoothA2dp.getCodecStatus();
+                codecStatus = mBluetoothA2dp.getCodecStatus(null);      // Use current active device
                 if (codecStatus != null) {
                     codecConfig = codecStatus.getCodecConfig();
                     codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
@@ -2095,14 +2095,14 @@
         case 6:
         synchronized (mBluetoothA2dpLock) {
             if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.enableOptionalCodecs();
+                mBluetoothA2dp.enableOptionalCodecs(null); // Use current active device
             }
         }
         return;
         case 7:
         synchronized (mBluetoothA2dpLock) {
             if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.disableOptionalCodecs();
+                mBluetoothA2dp.disableOptionalCodecs(null); // Use current active device
             }
         }
         return;
@@ -2225,7 +2225,8 @@
 
         synchronized (mBluetoothA2dpLock) {
             if (mBluetoothA2dp != null) {
-                mBluetoothA2dp.setCodecConfigPreference(codecConfig);
+                // Use current active device
+                mBluetoothA2dp.setCodecConfigPreference(null, codecConfig);
             }
         }
     }