diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-01-07 09:22:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-07 09:22:04 -0800 |
| commit | 1ee5ceb92d938fc544df2cf1dcb4f4ddf726cfb9 (patch) | |
| tree | 01ec1873d8b443596efb067186c4da32b729d109 /core/java/android/server | |
| parent | 93cee56d87ef9571e7f535d0bf356b160d5f6710 (diff) | |
| parent | 2790b20c537b33dbf366436f6d27776148ded490 (diff) | |
| download | frameworks_base-1ee5ceb92d938fc544df2cf1dcb4f4ddf726cfb9.zip frameworks_base-1ee5ceb92d938fc544df2cf1dcb4f4ddf726cfb9.tar.gz frameworks_base-1ee5ceb92d938fc544df2cf1dcb4f4ddf726cfb9.tar.bz2 | |
am 2790b20c: am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
Merge commit '2790b20c537b33dbf366436f6d27776148ded490'
* commit '2790b20c537b33dbf366436f6d27776148ded490':
Fix media option settings for A2DP.
Diffstat (limited to 'core/java/android/server')
| -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 816ae14..e41f9de 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -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 |