diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-15 14:27:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 14:27:55 -0700 |
| commit | 64144c44748d14908fb7ddf9363fc81a4aa9a05a (patch) | |
| tree | 83cdade7c41cf6dd96461c67a73a79ab416a701a | |
| parent | a79935afd08a2dd891373561a3f46c9fa05b2560 (diff) | |
| parent | 096a1e6c83d3638788468dfb21a3b4662745d617 (diff) | |
| download | frameworks_base-64144c44748d14908fb7ddf9363fc81a4aa9a05a.zip frameworks_base-64144c44748d14908fb7ddf9363fc81a4aa9a05a.tar.gz frameworks_base-64144c44748d14908fb7ddf9363fc81a4aa9a05a.tar.bz2 | |
am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617'
* commit '096a1e6c83d3638788468dfb21a3b4662745d617':
Check for state before disconnecting.
| -rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index d44b28b..7b2022b 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -374,6 +374,11 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { int state = getConnectionState(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)) { |