commit 105bb2145aba70c03b43bfab906c1b0551387309
author Jaikumar Ganesh <jaikumar@google.com> Mon Dec 07 14:59:07 2009 -0800
committer Jaikumar Ganesh <jaikumar@google.com> Mon Dec 07 14:59:07 2009 -0800
tree 0a398a015a57deb42d5a345e1221c142431540ce
parent 0aabf735b2c686fd8f6763e5ef5c0b71b47497b2

Fix handling of SINK_STATE_CHANGE while suspend / resuming.

Update state only for the device which is connected.
We will hit this issue more often with car docks.

Bug:2133530
Dr No:Eastham

src/com/android/phone/BluetoothHandsfree.java

diff --git a/src/com/android/phone/BluetoothHandsfree.java b/src/com/android/phone/BluetoothHandsfree.java
index 9a89984..f0c6dc6 100644
--- a/src/com/android/phone/BluetoothHandsfree.java
+++ b/src/com/android/phone/BluetoothHandsfree.java
@@ -552,9 +552,18 @@
                             BluetoothA2dp.STATE_DISCONNECTED);
                     BluetoothDevice device =
                             intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+
+                    // We are only concerned about Connected sinks to suspend and resume
+                    // them. We can safely ignore SINK_STATE_CHANGE for other devices.
+                    if (mA2dpDevice != null && !device.equals(mA2dpDevice)) return;
+
                     synchronized (BluetoothHandsfree.this) {
                         mA2dpState = state;
-                        mA2dpDevice = device;
+                        if (state == BluetoothA2dp.STATE_DISCONNECTED) {
+                            mA2dpDevice = null;
+                        } else {
+                            mA2dpDevice = device;
+                        }
                         if (oldState == BluetoothA2dp.STATE_PLAYING &&
                             mA2dpState == BluetoothA2dp.STATE_CONNECTED) {
                             if (mA2dpSuspended) {