diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-10-29 17:24:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-29 17:24:05 +0000 |
| commit | db41880dd3259646b9ea43be6d8a91d4adb40122 (patch) | |
| tree | e361e98a8e3f0799b9b3c87f519608f87fc808ac | |
| parent | ba9836d9726bbc7413a07ae2b86afde8adcd4cc3 (diff) | |
| parent | 570cc5302a2e076f2b6ce810f9ac6f3c53bcd125 (diff) | |
| download | frameworks_base-db41880dd3259646b9ea43be6d8a91d4adb40122.zip frameworks_base-db41880dd3259646b9ea43be6d8a91d4adb40122.tar.gz frameworks_base-db41880dd3259646b9ea43be6d8a91d4adb40122.tar.bz2 | |
Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
| -rw-r--r-- | media/java/android/media/AudioService.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index a84fe44..6a69517 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -2574,13 +2574,17 @@ public class AudioService extends IAudioService.Stub { if (mScoAudioState == SCO_STATE_INACTIVE) { mScoAudioMode = scoAudioMode; if (scoAudioMode == SCO_MODE_UNDEFINED) { - mScoAudioMode = new Integer(Settings.Global.getInt( - mContentResolver, - "bluetooth_sco_channel_"+ - mBluetoothHeadsetDevice.getAddress(), - SCO_MODE_VIRTUAL_CALL)); - if (mScoAudioMode > SCO_MODE_MAX || mScoAudioMode < 0) { - mScoAudioMode = SCO_MODE_VIRTUAL_CALL; + if (mBluetoothHeadsetDevice != null) { + mScoAudioMode = new Integer(Settings.Global.getInt( + mContentResolver, + "bluetooth_sco_channel_"+ + mBluetoothHeadsetDevice.getAddress(), + SCO_MODE_VIRTUAL_CALL)); + if (mScoAudioMode > SCO_MODE_MAX || mScoAudioMode < 0) { + mScoAudioMode = SCO_MODE_VIRTUAL_CALL; + } + } else { + mScoAudioMode = SCO_MODE_RAW; } } if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) { |