Merge "bluetooth: Fix Mono/Stereo selection with new codec list" into main am: c640aeeec9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241341

Change-Id: I08cbe0634d9c4926af2d9ac927e81960d966f5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jakub Rotkiewicz (xWF)
2024-08-27 20:42:02 +00:00
committed by Automerger Merge Worker

View File

@@ -80,8 +80,7 @@ public class BluetoothA2dpConfigStore {
/** Create codec config utilizing {@link BluetoothCodecConfig.SourceCodecType} */ /** Create codec config utilizing {@link BluetoothCodecConfig.SourceCodecType} */
public BluetoothCodecConfig createCodecConfig() { public BluetoothCodecConfig createCodecConfig() {
return new BluetoothCodecConfig.Builder() BluetoothCodecConfig.Builder builder = new BluetoothCodecConfig.Builder()
.setCodecType(mCodecTypeNative)
.setCodecPriority(mCodecPriority) .setCodecPriority(mCodecPriority)
.setSampleRate(mSampleRate) .setSampleRate(mSampleRate)
.setBitsPerSample(mBitsPerSample) .setBitsPerSample(mBitsPerSample)
@@ -89,8 +88,13 @@ public class BluetoothA2dpConfigStore {
.setCodecSpecific1(mCodecSpecific1Value) .setCodecSpecific1(mCodecSpecific1Value)
.setCodecSpecific2(mCodecSpecific2Value) .setCodecSpecific2(mCodecSpecific2Value)
.setCodecSpecific3(mCodecSpecific3Value) .setCodecSpecific3(mCodecSpecific3Value)
.setCodecSpecific4(mCodecSpecific4Value) .setCodecSpecific4(mCodecSpecific4Value);
.build(); if (Flags.a2dpOffloadCodecExtensibilitySettings()) {
builder.setExtendedCodecType(mCodecType);
} else {
builder.setCodecType(mCodecTypeNative);
}
return builder.build();
} }
/** Create codec config utilizing {@link BluetoothCodecType} */ /** Create codec config utilizing {@link BluetoothCodecType} */