commit 60aece8c3296184b831534585f2b47e1487e8ea8
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 06 05:58:19 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Apr 06 05:58:19 2020 -0700
tree 141c050f54124ebcb09d4cb746bed2ce08e37c4b
parent 9a79a4e16f0d8c0ad8360b76dd8cb4dd34888b1c
parent edf601aec3da7a6a0ec786f387adf83a02e6a6da

Merge edf601aec3da7a6a0ec786f387adf83a02e6a6da on remote branch

Change-Id: I7c43fa5c81a8da7a47fcc7d360da3716e19fa406

PMC/src/com/android/pmc/A2dpReceiver.java

diff --git a/PMC/src/com/android/pmc/A2dpReceiver.java b/PMC/src/com/android/pmc/A2dpReceiver.java
index 843f7ae..162d864 100644
--- a/PMC/src/com/android/pmc/A2dpReceiver.java
+++ b/PMC/src/com/android/pmc/A2dpReceiver.java
@@ -403,7 +403,12 @@
         BluetoothCodecConfig[] codecsSelectableCapabilities = null;
 
         if (mBluetoothA2dp != null) {
-            codecStatus = mBluetoothA2dp.getCodecStatus(null);  // Use current active device
+            BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+            if (activeDevice == null) {
+                Log.e(TAG, "getCodecValue: Active device is null");
+                return null;
+            }
+            codecStatus = mBluetoothA2dp.getCodecStatus(activeDevice);
             if (codecStatus != null) {
                 codecConfig = codecStatus.getCodecConfig();
                 codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
@@ -465,8 +470,13 @@
         }
 
         if (mBluetoothA2dp != null) {
+            BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+            if (activeDevice == null) {
+                Log.e(TAG, "setCodecValue: Active device is null. Codec is not set.");
+                return false;
+            }
             Log.d(TAG, "setCodecConfigPreference()");
-            mBluetoothA2dp.setCodecConfigPreference(null, codecConfig); // Use current active device
+            mBluetoothA2dp.setCodecConfigPreference(mBluetoothA2dp.getActiveDevice(), codecConfig);
         } else {
             Log.e(TAG, "mBluetoothA2dp is null. Codec is not set");
             return false;