A2dp: update correct state to HeadsetA2dpSync while enter Disconnected
Root Cause:
If disconnect a2dp while audio is playing, broadcast connection state
intent first, then audio state. As a result, updateA2DPConnectionState
first set a2dp state to disconnectd, then updateA2DPPlayingState for
NOT_PLAYING set a2dp state to connected again. Finally, a2dp state in
HeadsetA2dpSync is connected even if a2dp get disconnected.
Fix:
1)A2DP SM: Broadcast connection state intent after audio state to make
sure update correct state to HeadsetA2dpSync.
2)HeadsetA2dpSync: Ignore updating play-status if a2dp is disconnected.
Change-Id: I726242e8357c7304b8e24232b98b5899f038dea2
CRs-Fixed: 2624877
diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index ceb6a4e..01018d0 100644
--- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
@@ -159,7 +159,6 @@
if (mLastConnectionState != -1) {
// Don't broadcast during startup
- broadcastConnectionState(mConnectionState, mLastConnectionState);
if (mIsPlaying) {
Log.i(TAG, "Disconnected: stopped playing: " + mDevice);
mIsPlaying = false;
@@ -167,6 +166,7 @@
broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
BluetoothA2dp.STATE_PLAYING);
}
+ broadcastConnectionState(mConnectionState, mLastConnectionState);
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService.isVendorIntfEnabled() &&
adapterService.isTwsPlusDevice(mDevice)) {
diff --git a/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java b/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
index 8adbdf2..4c28e8b 100644
--- a/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
+++ b/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
@@ -181,7 +181,9 @@
}
switch(currState) {
case BluetoothA2dp.STATE_NOT_PLAYING:
- mA2dpConnState.put(device, A2DP_CONNECTED);
+ if (mA2dpConnState.containsKey(device)) {
+ mA2dpConnState.put(device, A2DP_CONNECTED);
+ }
/*
* send message to statemachine. We send message to SMs
* only when all devices moved to SUSPENDED.
@@ -193,7 +195,9 @@
}
break;
case BluetoothA2dp.STATE_PLAYING:
- mA2dpConnState.put(device, A2DP_PLAYING);
+ if (mA2dpConnState.containsKey(device)) {
+ mA2dpConnState.put(device, A2DP_PLAYING);
+ }
// if call/ ring is ongoing and we received playing,
// we need to suspend
if (mHeadsetService.isInCall() || mHeadsetService.isRinging()) {