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

Commit a53cc506 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: 6a153ac4

Change-Id: I1ca21a7c2a2c2792ba3fa6055f767d3b8686f5d5
parents 8076dcde 6a153ac4

src/com/android/settings/DevelopmentSettings.java

+17 −7
Original line number Diff line number Diff line
@@ -1836,15 +1836,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:

            index = 1;

            break;

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:

            index = 2;

            break;

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:

            index = 3;

            break;

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:

            index = 4;

            break;

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:

            index = 5;

            break;

        case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID:

        default:

            break;
@@ -1986,12 +1989,15 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;

                break;

            case 2:

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;

                break;

            case 3:

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;

                break;

            case 4:

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;

                break;

            case 5:

                codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;

                break;

            default:
@@ -2003,14 +2009,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;

            break;

        case 2:

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;

            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;

            break;

        case 3:

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;

            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;

            break;

        case 4:

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;

            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;

            break;

        case 5:

            codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;

            codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;

            break;