commit 3675982bc5f835ceeeb81854ad436d889f01e1b2
author Henri Chataing <henrichataing@google.com> Fri Dec 08 17:49:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 08 17:49:48 2023 +0000
tree d94483e410a3a9bc6b27d8bdd1a65161c1bf8efd
parent 4ad1e4b1c746eded5ab9f032e88172325ebd0480
parent 6fe49512a0d6819e5f1365f72940de4940886379

Revert "Update facade for BluetoothCodecConfig with BluetoothCod..." am: 22e1ce1530 am: c82cffda3d am: 6fe49512a0

Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2862774

Change-Id: I3cee25ace64aea98994a66a8e527d9a815e6cbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
index e3304ff..2c200d3 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
@@ -21,7 +21,6 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
-import android.bluetooth.BluetoothCodecType;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
@@ -63,7 +62,7 @@
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         mBluetoothA2dpReceiver = new BluetoothA2dpReceiver();
         mBluetoothCodecConfig = new BluetoothCodecConfig(
-                null,
+                BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID,
                 BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
                 BluetoothCodecConfig.SAMPLE_RATE_NONE,
                 BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
@@ -259,7 +258,7 @@
             continue;
         }
         BluetoothCodecConfig codecConfig = new BluetoothCodecConfig(
-                BluetoothCodecType.createFromType(codecType),
+                codecType,
                 BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
                 sampleRate,
                 bitsPerSample,