PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d am: e3fc5f7b56

Browse Source 
am: fbdc22ff9a

Change-Id: I002e9ef05e3fa91b6430b1d31bc3178e87b097d0
This commit is contained in:
Pavlin Radoslavov
2017-01-26 19:42:33 +00:00
committed by android-build-merger
parent b9cf917f40 fbdc22ff9a
commit 86c492ffcc
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1812,15 +1812,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:
index = 1; index = 1;
break; break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:
index = 2; index = 2;
break; break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:
index = 3; index = 3;
break; break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
index = 4; index = 4;
break; break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
index = 5;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID:
default: default:
break; break;
@@ -1962,12 +1965,15 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
break; break;
case 2: case 2:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
break; break;
case 3: case 3:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
break; break;
case 4: case 4:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
break;
case 5:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
break; break;
default: default:
@@ -1979,14 +1985,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break; break;
case 2: case 2:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break; break;
case 3: case 3:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break; break;
case 4: case 4:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 5:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC; codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST; codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break; break;