Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc

am: 0356b740f2

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
This commit is contained in:
Pavlin Radoslavov
2017-02-02 04:35:49 +00:00
committed by android-build-merger

View File

@@ -1829,11 +1829,13 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
synchronized (mBluetoothA2dpLock) {
if (mBluetoothA2dp != null) {
codecStatus = mBluetoothA2dp.getCodecStatus();
if (codecStatus != null) {
codecConfig = codecStatus.getCodecConfig();
codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
codecsSelectableCapabilities = codecStatus.getCodecsSelectableCapabilities();
}
}
}
if (codecConfig == null)
return;