commit 46a2941b3f2e5c38388f3e503a22768ca2d9814a
author Jaikumar Ganesh <jaikumar@google.com> Tue Mar 08 19:40:12 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 19:40:12 2011 -0800
tree a7d9dc0944aab921a0c538d846c9f7ddf949ee04
parent 4652c45e6b8ddf4e335a478e823052696b82011e
parent 37bf3353d15fb7927b52fa8f8883a7c6c865fae4

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

src/com/android/settings/bluetooth/HeadsetProfile.java

diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
index dac47b7..e9c52ef 100644
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -133,6 +133,8 @@
     }
 
     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)