am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair

Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp

* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
  Fix media option settings for A2DP.
This commit is contained in:
Jaikumar Ganesh
2010-01-06 13:46:59 -08:00
committed by Android Git Automerger

View File

@@ -463,7 +463,8 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
mAudioManager.setParameters("A2dpSuspended=false");
}
if (state == BluetoothA2dp.STATE_CONNECTING ||
if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
state == BluetoothA2dp.STATE_CONNECTING ||
state == BluetoothA2dp.STATE_CONNECTED) {
// We have connected or attempting to connect.
// Bump priority