Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91de2f3 authored by Jakub Rotkiewicz (xWF)'s avatar Jakub Rotkiewicz (xWF) Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I8a782e17854159f468acf4fb157a294896c4f120
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9f4f705 51cac72d

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

+8 −4
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ public class BluetoothA2dpConfigStore { 


    /** Create codec config utilizing {@link BluetoothCodecConfig.SourceCodecType} */

    public BluetoothCodecConfig createCodecConfig() {

        return new BluetoothCodecConfig.Builder()

                .setCodecType(mCodecTypeNative)

        BluetoothCodecConfig.Builder builder = new BluetoothCodecConfig.Builder()

                .setCodecPriority(mCodecPriority)

                .setSampleRate(mSampleRate)

                .setBitsPerSample(mBitsPerSample)
@@ -89,8 +88,13 @@ public class BluetoothA2dpConfigStore { 
                .setCodecSpecific1(mCodecSpecific1Value)

                .setCodecSpecific2(mCodecSpecific2Value)

                .setCodecSpecific3(mCodecSpecific3Value)

                .setCodecSpecific4(mCodecSpecific4Value)

                .build();

                .setCodecSpecific4(mCodecSpecific4Value);

        if (Flags.a2dpOffloadCodecExtensibilitySettings()) {

            builder.setExtendedCodecType(mCodecType);

        } else {

            builder.setCodecType(mCodecTypeNative);

        }

        return builder.build();

    }



    /** Create codec config utilizing {@link BluetoothCodecType} */