Merge "Check for state before disconnecting." into gingerbread

2010-10-14 12:36:00 -07:00
parent 75d3591b2d 5844f1d357
commit 8b525c0760
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/server/BluetoothA2dpService.java
+++ b/core/java/android/server/BluetoothA2dpService.java
@@ -367,6 +367,11 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
        int state = getSinkState(device);
        String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());

+        switch (state) {
+            case BluetoothA2dp.STATE_DISCONNECTED:
+            case BluetoothA2dp.STATE_DISCONNECTING:
+                return false;
+        }
        // State is CONNECTING or CONNECTED or PLAYING
        handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTING);
        if (!disconnectSinkNative(path)) {