Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo

Browse Source
This commit is contained in:
Jean-Michel Trivi
2010-04-23 14:48:10 -07:00
committed by Android (Google) Code Review
parent 2adec762fb a847ba4080
commit 47dad8fa8d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/java/android/media/AudioService.java
View File

@@ -1751,10 +1751,17 @@ public class AudioService extends IAudioService.Stub {
} }
private void cancelA2dpDeviceTimeout(String address) { private void cancelA2dpDeviceTimeout() {
mAudioHandler.removeMessages(MSG_BTA2DP_DOCK_TIMEOUT); mAudioHandler.removeMessages(MSG_BTA2DP_DOCK_TIMEOUT);
} }
private boolean hasScheduledA2dpDockTimeout() {
return mAudioHandler.hasMessages(MSG_BTA2DP_DOCK_TIMEOUT);
}
/* cache of the address of the last dock the device was connected to */
private String mDockAddress;
/** /**
* Receiver for misc intent broadcasts the Phone app cares about. * Receiver for misc intent broadcasts the Phone app cares about.
*/ */
@@ -1805,7 +1812,15 @@ public class AudioService extends IAudioService.Stub {
state == BluetoothA2dp.STATE_PLAYING)) { state == BluetoothA2dp.STATE_PLAYING)) {
if (btDevice.isBluetoothDock()) { if (btDevice.isBluetoothDock()) {
// this could be a reconnection after a transient disconnection // this could be a reconnection after a transient disconnection
cancelA2dpDeviceTimeout(address); cancelA2dpDeviceTimeout();
mDockAddress = address;
} else {
// this could be a connection of another A2DP device before the timeout of
// a dock: cancel the dock timeout, and make the dock unavailable now
if(hasScheduledA2dpDockTimeout()) {
cancelA2dpDeviceTimeout();
makeA2dpDeviceUnavailableNow(mDockAddress);
}
} }
makeA2dpDeviceAvailable(address); makeA2dpDeviceAvailable(address);
} }