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

Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"

Browse Source 
am: ad62fd52c9

Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142
This commit is contained in:
Pavlin Radoslavov
2017-02-07 04:50:15 +00:00
committed by android-build-merger
parent 0356b740f2 ad62fd52c9
commit 14eb8cfe57
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1825,6 +1825,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
BluetoothCodecConfig[] codecsLocalCapabilities = null;
BluetoothCodecConfig[] codecsSelectableCapabilities = null;
String streaming;
Resources resources = null;
synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) {
@@ -1839,6 +1840,15 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
if (codecConfig == null)
return;
try {
resources = getResources();
} catch (IllegalStateException e) {
return;
}
if (resources == null) {
return;
}
// Update the Codec Type
index = -1;
switch (codecConfig.getCodecType()) {
@@ -1862,8 +1872,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
break;
}
if (index >= 0) {
summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_summaries);
streaming = getResources().getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_summaries);
streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
mBluetoothSelectA2dpCodec.setSummary(streaming);
}
@@ -1889,8 +1899,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
break;
}
if (index >= 0) {
summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
streaming = getResources().getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_sample_rate_summaries);
streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
mBluetoothSelectA2dpSampleRate.setSummary(streaming);
}
@@ -1911,8 +1921,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
break;
}
if (index >= 0) {
summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
streaming = getResources().getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
mBluetoothSelectA2dpBitsPerSample.setSummary(streaming);
}
@@ -1930,8 +1940,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
break;
}
if (index >= 0) {
summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
streaming = getResources().getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_channel_mode_summaries);
streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
mBluetoothSelectA2dpChannelMode.setSummary(streaming);
}
@@ -1956,8 +1966,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
break;
}
if (index >= 0) {
summaries = getResources().getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
streaming = getResources().getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
summaries = resources.getStringArray(R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
streaming = resources.getString(R.string.bluetooth_select_a2dp_codec_streaming_label, summaries[index]);
mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(streaming);
}
}