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

Commit f54c0371 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Replacing BluetoothCodecStatus creator by Builder" am: 471a9165 am:... 

Merge "Replacing BluetoothCodecStatus creator by Builder" am: 471a9165 am: bfbeff05 am: 76678041

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2013036

Change-Id: I7330fca5e4ed87bea7c360ed972cc6df6d0a39d5
parents af4514e5 76678041

media/java/android/media/AudioManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -6952,7 +6952,8 @@ public class AudioManager { 
        for (Integer format : formatsList) {

        for (Integer format : formatsList) {

            int btSourceCodec = AudioSystem.audioFormatToBluetoothSourceCodec(format);

            int btSourceCodec = AudioSystem.audioFormatToBluetoothSourceCodec(format);

            if (btSourceCodec != BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID) {

            if (btSourceCodec != BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID) {

                codecConfigList.add(new BluetoothCodecConfig(btSourceCodec));

                codecConfigList.add(

                        new BluetoothCodecConfig.Builder().setCodecType(btSourceCodec).build());

            }

            }

        }

        }

        return codecConfigList;

        return codecConfigList;