Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d am: e3fc5f7b56
am: fbdc22ff9a
Change-Id: I002e9ef05e3fa91b6430b1d31bc3178e87b097d0
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index a5b4059..2c50c5f 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1812,15 +1812,18 @@
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;
@@ -1962,12 +1965,15 @@
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:
@@ -1979,14 +1985,18 @@
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;