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

Commit 450794b2 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "a2dp: Fix value of CODEC_ID_AAC" into main

parents c4cd266a e2eb20ff

framework/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ package android.bluetooth { 
    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") @NonNull public String getCodecName();

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") public boolean isMandatoryCodec();

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final long CODEC_ID_AAC = 1L; // 0x1L

    field public static final long CODEC_ID_AAC = 2L; // 0x2L

    field public static final long CODEC_ID_APTX = 16797695L; // 0x1004fffL

    field public static final long CODEC_ID_APTX_HD = 604035071L; // 0x2400d7ffL

    field public static final long CODEC_ID_LDAC = -1442763265L; // 0xffffffffaa012dffL

framework/java/android/bluetooth/BluetoothCodecType.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public final class BluetoothCodecType implements Parcelable { 
    public static final long CODEC_ID_SBC = 0x0000000000;



    /** AAC codec identifier. See {@link BluetoothCodecType#getCodecId}. */

    public static final long CODEC_ID_AAC = 0x0000000001;

    public static final long CODEC_ID_AAC = 0x0000000002;



    /** AptX codec identifier. See {@link BluetoothCodecType#getCodecId}. */

    public static final long CODEC_ID_APTX = 0x0001004fff;

system/stack/include/a2dp_constants.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ typedef uint8_t tA2DP_CODEC_TYPE; /* A2DP Codec type: A2DP_MEDIA_CT_* */ 
//          set to 0, if octet 0 is not 0xFF.

enum : uint64_t {

  A2DP_CODEC_ID_SBC = 0x0000000000,

  A2DP_CODEC_ID_AAC = 0x0000000001,

  A2DP_CODEC_ID_AAC = 0x0000000002,

  A2DP_CODEC_ID_APTX = 0x0001004fff,

  A2DP_CODEC_ID_APTX_HD = 0x002400d7ff,

  A2DP_CODEC_ID_LDAC = 0x00aa012dff,