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

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

Browse Source 
am: 33b4688634

Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
This commit is contained in:
Pavlin Radoslavov
2017-02-02 04:38:17 +00:00
committed by android-build-merger
parent 91bd9f3072 33b4688634
commit 068780c052
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DevelopmentSettings.java
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)