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

Commit 0a7f6d8c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add AUDIO_FORMAT_LC3 in BtCodec" am: a57618d3 am: cb6ef1e9 am: 34e5b686 

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

Change-Id: I9103756ff79c8641c0bef708981df9322b8dbb55
parents 46834287 34e5b686

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9068,6 +9068,7 @@ package android.bluetooth { 
    field public static final int SOURCE_CODEC_TYPE_APTX = 2; // 0x2

    field public static final int SOURCE_CODEC_TYPE_APTX_HD = 3; // 0x3

    field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240

    field public static final int SOURCE_CODEC_TYPE_LC3 = 5; // 0x5

    field public static final int SOURCE_CODEC_TYPE_LDAC = 4; // 0x4

    field public static final int SOURCE_CODEC_TYPE_SBC = 0; // 0x0

  }

media/java/android/media/AudioSystem.java

+7 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ public class AudioSystem 
            AUDIO_FORMAT_SBC,

            AUDIO_FORMAT_APTX,

            AUDIO_FORMAT_APTX_HD,

            AUDIO_FORMAT_LDAC}

            AUDIO_FORMAT_LDAC,

            AUDIO_FORMAT_LC3}

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface AudioFormatNativeEnumForBtCodec {}
@@ -275,6 +276,7 @@ public class AudioSystem 
            case AUDIO_FORMAT_APTX: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;

            case AUDIO_FORMAT_APTX_HD: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;

            case AUDIO_FORMAT_LDAC: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;

            case AUDIO_FORMAT_LC3: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LC3;

            default:

                Log.e(TAG, "Unknown audio format 0x" + Integer.toHexString(audioFormat)

                        + " for conversion to BT codec");
@@ -315,6 +317,8 @@ public class AudioSystem 
                return AudioSystem.AUDIO_FORMAT_APTX_HD;

            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:

                return AudioSystem.AUDIO_FORMAT_LDAC;

            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LC3:

                return AudioSystem.AUDIO_FORMAT_LC3;

            default:

                Log.e(TAG, "Unknown BT codec 0x" + Integer.toHexString(btCodec)

                        + " for conversion to audio format");
@@ -415,6 +419,8 @@ public class AudioSystem 
                return "AUDIO_FORMAT_LHDC_LL";

            case /* AUDIO_FORMAT_APTX_TWSP       */ 0x2A000000:

                return "AUDIO_FORMAT_APTX_TWSP";

            case /* AUDIO_FORMAT_LC3             */ 0x2B000000:

                return "AUDIO_FORMAT_LC3";



            /* Aliases */

            case /* AUDIO_FORMAT_PCM_16_BIT        */ 0x1: