Merge "Fix A2DP connection problem, if disconnected while playing music."

2010-10-26 11:31:44 -07:00
parent bb8300e155 b2ec4fa8d7
commit 7d0f553852
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/server/BluetoothA2dpService.java
+++ b/core/java/android/server/BluetoothA2dpService.java
@@ -498,6 +498,7 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
                    handleSinkPlayingStateChange(device, BluetoothA2dp.STATE_NOT_PLAYING,
                        BluetoothA2dp.STATE_PLAYING);
                } else {
+                   mPlayingA2dpDevice = null;
                   int prevState = mAudioDevices.get(device);
                   handleSinkStateChange(device, prevState, state);
                }
@@ -512,7 +513,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
                mSinkCount--;
            } else if (state == BluetoothA2dp.STATE_CONNECTED) {
                mSinkCount ++;
-                mPlayingA2dpDevice = null;
            }
            mAudioDevices.put(device, state);