commit 78115c0abc8e1ead5fa2d1e0125de4c9c9de2d32
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 02 04:29:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 02 04:29:16 2017 +0000
tree 1e6dbada63fd7126a38ff26fa68ccab86bcea647
parent fb0ab547c29cf15749103de81d4554b2d0aea035
parent 789d21d475a9e3fa494fb7e171bb70d3cbb566ae

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

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index db599c5..8d97a97 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1829,9 +1829,11 @@
         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)