From 625bc4bd21bdaa0573143c9e5d146be9804d6bb7 Mon Sep 17 00:00:00 2001 From: bohu Date: Wed, 24 Feb 2016 06:55:16 -0800 Subject: [PATCH] Emulator: avoid accessing null BluetoothAdapter bug: 27324609 Emulator has no bluetooth support at this moment, and settings should not crash in this case. Change-Id: I1bfc6c907ac02d4798b6c118291e6a9d1bf23c7c --- src/com/android/settings/bluetooth/BluetoothSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 9aa14fc1915..7db915faa86 100644 --- 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;