Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use localized strings for HD Audio option label" into oc-mr1-dev

Browse Source 
am: ced95e7f38

Change-Id: I791daac12e5e3e4a7435f412bbf2c22ba62e3463
This commit is contained in:
Justin Klaassen
2017-08-29 22:50:38 +00:00
committed by android-build-merger
parent 60e09929e7 ced95e7f38
commit 9b918e8340
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
View File

@@ -233,8 +233,8 @@ public class A2dpProfile implements LocalBluetoothProfile {
public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;
if (!supportsHighQualityAudio(device) ||
getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) {
if (!supportsHighQualityAudio(device)
|| getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) {
return mContext.getString(unknownCodecId);
}
// We want to get the highest priority codec, since that's the one that will be used with
@@ -248,11 +248,36 @@ public class A2dpProfile implements LocalBluetoothProfile {
return b.getCodecPriority() - a.getCodecPriority();
});
}
if (selectable == null || selectable.length < 1 || selectable[0].isMandatoryCodec()) {
final BluetoothCodecConfig codecConfig = (selectable == null || selectable.length < 1)
? null : selectable[0];
final int codecType = (codecConfig == null || codecConfig.isMandatoryCodec())
? BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID : codecConfig.getCodecType();
int index = -1;
switch (codecType) {
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:
index = 1;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:
index = 2;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:
index = 3;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
index = 4;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
index = 5;
break;
}
if (index < 0) {
return mContext.getString(unknownCodecId);
}
return mContext.getString(R.string.bluetooth_profile_a2dp_high_quality,
selectable[0].getCodecName());
mContext.getResources().getStringArray(R.array.bluetooth_a2dp_codec_titles)[index]);
}
public String toString() {