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

Merge commit '2790b20c537b33dbf366436f6d27776148ded490'

* commit '2790b20c537b33dbf366436f6d27776148ded490':
  Fix media option settings for A2DP.
This commit is contained in:
Jaikumar Ganesh
2010-01-07 09:22:04 -08:00
committed by Android Git Automerger

View File

@@ -470,7 +470,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