diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-12 19:06:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 19:06:13 -0700 |
| commit | 373a69614e534ae04dddd79c92933b6d8969fad7 (patch) | |
| tree | ed5f91023f643da6dd07f96ab85a6178c5ce2274 /core/java/android/bluetooth | |
| parent | 6066da89a464d2bd5f002f5e687d40876ed5ce21 (diff) | |
| parent | 64f4280313c5b498a3238d174c4d14ca2187604b (diff) | |
| download | frameworks_base-373a69614e534ae04dddd79c92933b6d8969fad7.zip frameworks_base-373a69614e534ae04dddd79c92933b6d8969fad7.tar.gz frameworks_base-373a69614e534ae04dddd79c92933b6d8969fad7.tar.bz2 | |
am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp
* commit '64f4280313c5b498a3238d174c4d14ca2187604b':
Bluez doesn't handle disconnect while connecting well.
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDeviceProfileState.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDeviceProfileState.java b/core/java/android/bluetooth/BluetoothDeviceProfileState.java index df1d960..ff82d39 100644 --- a/core/java/android/bluetooth/BluetoothDeviceProfileState.java +++ b/core/java/android/bluetooth/BluetoothDeviceProfileState.java @@ -516,7 +516,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine } break; case DISCONNECT_A2DP_OUTGOING: - processCommand(DISCONNECT_A2DP_OUTGOING); + deferMessage(message); break; case DISCONNECT_A2DP_INCOMING: // Ignore, will be handled by Bluez |