summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jaikumar Ganesh <jaikumar@google.com> 2010-10-14 21:19:04 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-14 21:19:04 -0700
commitc8e87e3ce64bc623b856c12cc63e4a46029da743 (patch)
treea6be75dacea62a54272947ae8b537500d73e2507
parent22b0eade14561db394187ec75a9e300f3591ebda (diff)
parent373a69614e534ae04dddd79c92933b6d8969fad7 (diff)
am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7' * commit '373a69614e534ae04dddd79c92933b6d8969fad7': Bluez doesn't handle disconnect while connecting well.
-rw-r--r--core/java/android/bluetooth/BluetoothDeviceProfileState.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDeviceProfileState.java b/core/java/android/bluetooth/BluetoothDeviceProfileState.java
index 1c53c45aa3b5..ce511bd39c9c 100644
--- a/core/java/android/bluetooth/BluetoothDeviceProfileState.java
+++ b/core/java/android/bluetooth/BluetoothDeviceProfileState.java
@@ -586,7 +586,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