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

am 947d8ee5: Merge change 21985 into eclair

Browse Source 
Merge commit '947d8ee56ab66ddb34f313c3e21c3a9e89b0e14d'

* commit '947d8ee56ab66ddb34f313c3e21c3a9e89b0e14d':
  Fix AudioService on HFP power off due to new Bluetooth API.
This commit is contained in:
Nick Pelly
2009-08-19 16:51:57 -07:00
committed by Android Git Automerger
parent 92f79a51bf 947d8ee56a
commit 2cc072c67c
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1391,21 +1391,26 @@ public class AudioService extends IAudioService.Stub {
} else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) {
int state = intent.getIntExtra(BluetoothIntent.HEADSET_STATE,
BluetoothHeadset.STATE_ERROR);
BluetoothDevice btDevice = intent.getParcelableExtra(BluetoothIntent.DEVICE);
String address = btDevice.getAddress();
int device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;
int btClass = btDevice.getBluetoothClass();
if (BluetoothClass.Device.Major.getDeviceMajor(btClass) == BluetoothClass.Device.Major.AUDIO_VIDEO) {
switch (BluetoothClass.Device.getDevice(btClass)) {
case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:
case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
break;
case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO:
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT;
break;
default:
break;
BluetoothDevice btDevice = intent.getParcelableExtra(BluetoothIntent.DEVICE);
String address = null;
int btClass = BluetoothClass.ERROR;
if (btDevice != null) {
address = btDevice.getAddress();
btClass = btDevice.getBluetoothClass();
if (BluetoothClass.Device.Major.getDeviceMajor(btClass) ==
BluetoothClass.Device.Major.AUDIO_VIDEO) {
switch (BluetoothClass.Device.getDevice(btClass)) {
case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:
case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
break;
case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO:
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT;
break;
default:
break;
}
}
}