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

Commit f23e80bb authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Integration of the AAC codec for A2DP source" 

am: 22f97c83

Change-Id: I22838db2b87f83a3832f78d74d08a6f988264284
parents c0118ac1 22f97c83

core/java/android/bluetooth/BluetoothCodecConfig.java

+4 −3
Original line number Diff line number Diff line
@@ -51,9 +51,10 @@ public final class BluetoothCodecConfig implements Parcelable { 
    // NOTE: The values should be same as those listed in the following file:

    //   hardware/libhardware/include/hardware/bt_av.h

    public static final int SOURCE_CODEC_TYPE_SBC     = 0;

    public static final int SOURCE_CODEC_TYPE_APTX    = 1;

    public static final int SOURCE_CODEC_TYPE_APTX_HD = 2;

    public static final int SOURCE_CODEC_TYPE_LDAC    = 3;

    public static final int SOURCE_CODEC_TYPE_AAC     = 1;

    public static final int SOURCE_CODEC_TYPE_APTX    = 2;

    public static final int SOURCE_CODEC_TYPE_APTX_HD = 3;

    public static final int SOURCE_CODEC_TYPE_LDAC    = 4;



    public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;

packages/SettingsLib/res/values/arrays.xml

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
    <string-array name="bluetooth_a2dp_codec_titles">

        <item>Use System Selection (Default)</item>

        <item>SBC</item>

        <item>AAC</item>

        <item>aptX</item>

        <item>aptX HD</item>

        <item>LDAC</item>
@@ -119,12 +120,14 @@ 
        <item>1</item>

        <item>2</item>

        <item>3</item>

        <item>4</item>

    </string-array>



    <!-- Summaries for Bluetooth Audio Codec selection preference. [CHAR LIMIT=40]-->

    <string-array name="bluetooth_a2dp_codec_summaries" >

        <item>Use System Selection (Default)</item>

        <item>SBC</item>

        <item>AAC</item>

        <item>aptX</item>

        <item>aptX HD</item>

        <item>LDAC</item>