Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b46886 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

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

am: 0356b740

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
parents 5741187f 0356b740

src/com/android/settings/DevelopmentSettings.java

+5 −3
Original line number Diff line number Diff line
@@ -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;