Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1

2011-03-08 19:40:12 -08:00
parent 4652c45e6b 37bf3353d1
commit 46a2941b3f
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -133,6 +133,8 @@ final class HeadsetProfile implements LocalBluetoothProfile {
    }

    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
+
        List<BluetoothDevice> deviceList = mService.getConnectedDevices();

        return !deviceList.isEmpty() && deviceList.get(0).equals(device)