From fa3bac5c8c6227d272279a6d9516f9301971c8ee Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Sat, 20 Dec 2014 17:28:31 +0100 Subject: [PATCH] Bluetooth: fix NPE when BT not supported --- src/BluetoothDevicePreference.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/BluetoothDevicePreference.java b/src/BluetoothDevicePreference.java index 71e219b..51abee5 100644 --- a/src/BluetoothDevicePreference.java +++ b/src/BluetoothDevicePreference.java @@ -16,7 +16,12 @@ protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder builder) { // hook into the builder to refresh the list BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter(); - Set pairedDevices = bta.getBondedDevices(); + Set pairedDevices = (bta != null) ? bta.getBondedDevices() : null; + if (pairedDevices == null) { + super.onPrepareDialogBuilder(builder); + return; + } + CharSequence[] entries = new CharSequence[pairedDevices.size()]; CharSequence[] entryValues = new CharSequence[pairedDevices.size()]; int i = 0;