aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Chataing <henrichataing@google.com>2023-12-08 17:17:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-08 17:17:56 +0000
commit6fe49512a0d6819e5f1365f72940de4940886379 (patch)
treed94483e410a3a9bc6b27d8bdd1a65161c1bf8efd
parent2b83499deaa2d7ad149d9fb3b9f11491bcd93dd8 (diff)
parentc82cffda3dc5f5a57c8b26eb6d0e44b1df22b603 (diff)
downloadsl4a-6fe49512a0d6819e5f1365f72940de4940886379.tar.gz
Revert "Update facade for BluetoothCodecConfig with BluetoothCod..." am: 22e1ce1530 am: c82cffda3d
Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2862774 Change-Id: I437e1008263db3c9541c19dd783766899822ce1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java5
1 files changed, 2 insertions, 3 deletions
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 e3304ffc..2c200d3e 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.BluetoothA2dp;
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 @@ public class BluetoothA2dpFacade extends RpcReceiver {
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 @@ public class BluetoothA2dpFacade extends RpcReceiver {
continue;
}
BluetoothCodecConfig codecConfig = new BluetoothCodecConfig(
- BluetoothCodecType.createFromType(codecType),
+ codecType,
BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
sampleRate,
bitsPerSample,