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

Merge "Remove SCO devices if Bluetooth process is dead" into pi-dev

Browse Source 
am: 1b43af094e

Change-Id: I2e4f230fd80fbcb4d7db943ba7e712e5a905409a
This commit is contained in:
Ugo Yu
2018-05-16 11:20:45 -07:00
committed by android-build-merger
parent da87a31e2a 1b43af094e
commit c1fd065527
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3722,26 +3722,35 @@ public class AudioService extends IAudioService.Stub
}
String address = btDevice.getAddress();
BluetoothClass btClass = btDevice.getBluetoothClass();
int outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;
int inDevice = AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET;
int[] outDeviceTypes = {
AudioSystem.DEVICE_OUT_BLUETOOTH_SCO,
AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET,
AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT
};
if (btClass != null) {
switch (btClass.getDeviceClass()) {
case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:
case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:
outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
outDeviceTypes = new int[] { AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET };
break;
case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO:
outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT;
outDeviceTypes = new int[] { AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT };
break;
}
}
if (!BluetoothAdapter.checkBluetoothAddress(address)) {
address = "";
}
String btDeviceName = btDevice.getName();
boolean result = handleDeviceConnection(isActive, outDevice, address, btDeviceName);
boolean result = false;
if (isActive) {
result |= handleDeviceConnection(isActive, outDeviceTypes[0], address, btDeviceName);
} else {
for (int outDeviceType : outDeviceTypes) {
result |= handleDeviceConnection(isActive, outDeviceType, address, btDeviceName);
}
}
// handleDeviceConnection() && result to make sure the method get executed
result = handleDeviceConnection(isActive, inDevice, address, btDeviceName) && result;
return result;