Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"

am: 78115c0abc

Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
This commit is contained in:
Pavlin Radoslavov
2017-02-02 04:32:48 +00:00
committed by android-build-merger

View File

@@ -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)