diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-01-06 13:46:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-06 13:46:59 -0800 |
| commit | 2790b20c537b33dbf366436f6d27776148ded490 (patch) | |
| tree | bb2d441dfad6a3f76b2acefb2b86dcee89201a88 /core/java | |
| parent | ce56857ef72538c197afd91b9f30dc868d2667d9 (diff) | |
| parent | 0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b (diff) | |
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.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index dfec1eb2a2b5..46145b967cdf 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -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 |