diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java index 0567371995976..fece57ee06c0a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java @@ -96,16 +96,18 @@ public class BluetoothController extends BroadcastReceiver { } private void updateBondedBluetoothDevices() { - Set devices = BluetoothAdapter.getDefaultAdapter().getBondedDevices(); - if (devices != null) { - mBondedDevices.clear(); - for (BluetoothDevice device : devices) { - if (device.getBondState() != BluetoothDevice.BOND_NONE) { - mBondedDevices.add(device); + mBondedDevices.clear(); + + BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + if (adapter != null) { + Set devices = adapter.getBondedDevices(); + if (devices != null) { + for (BluetoothDevice device : devices) { + if (device.getBondState() != BluetoothDevice.BOND_NONE) { + mBondedDevices.add(device); + } } } - } else { - mBondedDevices.clear(); } }