Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev

Browse Source 
* commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1':
  Fix exception in AudioService when no BT Headset is connected.
This commit is contained in:
Andre Eisenbach
2014-10-30 23:42:40 +00:00
committed by Android Git Automerger
parent 3488549f75 34964701e0
commit 1bf7bca511
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/java/android/media/AudioService.java
View File

@@ -2574,13 +2574,17 @@ public class AudioService extends IAudioService.Stub {
if (mScoAudioState == SCO_STATE_INACTIVE) { if (mScoAudioState == SCO_STATE_INACTIVE) {
mScoAudioMode = scoAudioMode; mScoAudioMode = scoAudioMode;
if (scoAudioMode == SCO_MODE_UNDEFINED) { if (scoAudioMode == SCO_MODE_UNDEFINED) {
mScoAudioMode = new Integer(Settings.Global.getInt( if (mBluetoothHeadsetDevice != null) {
mContentResolver, mScoAudioMode = new Integer(Settings.Global.getInt(
"bluetooth_sco_channel_"+ mContentResolver,
mBluetoothHeadsetDevice.getAddress(), "bluetooth_sco_channel_"+
SCO_MODE_VIRTUAL_CALL)); mBluetoothHeadsetDevice.getAddress(),
if (mScoAudioMode > SCO_MODE_MAX || mScoAudioMode < 0) { SCO_MODE_VIRTUAL_CALL));
mScoAudioMode = 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) { if (mBluetoothHeadset != null && mBluetoothHeadsetDevice != null) {