commit 9b9ca65db9a0692c2381eb0a68a02ab6325fc7db
author Bo Hu <bohu@google.com> Wed Feb 24 22:18:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 22:18:12 2016 +0000
tree 7e05c5944c36439d42a007a843a30faf6336310f
parent fa3816d771a828a74c407761272a9b9434d69c70
parent 625bc4bd21bdaa0573143c9e5d146be9804d6bb7

Merge "Emulator: avoid accessing null BluetoothAdapter" into nyc-dev

src/com/android/settings/bluetooth/BluetoothSettings.java

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 9aa14fc..7db915f 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -496,8 +496,9 @@
 
         @Override
         public void setListening(boolean listening) {
+            BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+            if (defaultAdapter == null) return;
             if (listening) {
-                BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
                 mEnabled = defaultAdapter.isEnabled();
                 mConnected =
                         defaultAdapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED;