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