diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java index 9c947c75f8d..406ac8f4505 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java @@ -30,6 +30,7 @@ import android.os.Handler; import android.os.ParcelUuid; import android.util.Log; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -466,7 +467,11 @@ abstract class LocalBluetoothProfileManager { @Override public List getConnectedDevices() { - return mService.getConnectedDevices(); + if (mService != null) { + return mService.getConnectedDevices(); + } else { + return new ArrayList(); + } } @Override