Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
am: 0356b740f2
Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
This commit is contained in:
@@ -1829,9 +1829,11 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
synchronized (mBluetoothA2dpLock) {
|
||||
if (mBluetoothA2dp != null) {
|
||||
codecStatus = mBluetoothA2dp.getCodecStatus();
|
||||
codecConfig = codecStatus.getCodecConfig();
|
||||
codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
|
||||
codecsSelectableCapabilities = codecStatus.getCodecsSelectableCapabilities();
|
||||
if (codecStatus != null) {
|
||||
codecConfig = codecStatus.getCodecConfig();
|
||||
codecsLocalCapabilities = codecStatus.getCodecsLocalCapabilities();
|
||||
codecsSelectableCapabilities = codecStatus.getCodecsSelectableCapabilities();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (codecConfig == null)
|
||||
|
Reference in New Issue
Block a user