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

2016-02-24 22:18:12 +00:00
parent fa3816d771 625bc4bd21
commit 9b9ca65db9
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -496,8 +496,9 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem

        @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;