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

Merge change 21985 into eclair

Browse Source 
* changes:
  Fix AudioService on HFP power off due to new Bluetooth API.
This commit is contained in:
Android (Google) Code Review
2009-08-19 15:30:38 -07:00
parent 51a9029cdc a56d1c7219
commit 947d8ee56a
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)) { } else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) {
int state = intent.getIntExtra(BluetoothIntent.HEADSET_STATE, int state = intent.getIntExtra(BluetoothIntent.HEADSET_STATE,
BluetoothHeadset.STATE_ERROR); BluetoothHeadset.STATE_ERROR);
BluetoothDevice btDevice = intent.getParcelableExtra(BluetoothIntent.DEVICE);
String address = btDevice.getAddress();
int device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO; int device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;
int btClass = btDevice.getBluetoothClass(); BluetoothDevice btDevice = intent.getParcelableExtra(BluetoothIntent.DEVICE);
if (BluetoothClass.Device.Major.getDeviceMajor(btClass) == BluetoothClass.Device.Major.AUDIO_VIDEO) { String address = null;
switch (BluetoothClass.Device.getDevice(btClass)) { int btClass = BluetoothClass.ERROR;
case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET: if (btDevice != null) {
case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE: address = btDevice.getAddress();
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET; btClass = btDevice.getBluetoothClass();
break; if (BluetoothClass.Device.Major.getDeviceMajor(btClass) ==
case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO: BluetoothClass.Device.Major.AUDIO_VIDEO) {
device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT; switch (BluetoothClass.Device.getDevice(btClass)) {
break; case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:
default: case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:
break; 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;
}
} }
} }