drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."

Browse Source 
* commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2':
  Prevent AudioService dead lock issue.
This commit is contained in:
Jean-Michel Trivi
2015-01-16 17:37:29 +00:00
committed by Android Git Automerger
parent 6c8c19da7b ef417bb7a0
commit c2230a9d1a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,6 +525,7 @@ public class AudioService extends IAudioService.Stub {
// Reference to BluetoothA2dp to query for AbsoluteVolume. // Reference to BluetoothA2dp to query for AbsoluteVolume.
private BluetoothA2dp mA2dp; private BluetoothA2dp mA2dp;
// lock always taken synchronized on mConnectedDevices
private final Object mA2dpAvrcpLock = new Object(); private final Object mA2dpAvrcpLock = new Object();
// If absolute volume is supported in AVRCP device // If absolute volume is supported in AVRCP device
private boolean mAvrcpAbsVolSupported = false; private boolean mAvrcpAbsVolSupported = false;
@ -2876,12 +2877,12 @@ public class AudioService extends IAudioService.Stub {
List<BluetoothDevice> deviceList; List<BluetoothDevice> deviceList;
switch(profile) { switch(profile) {
case BluetoothProfile.A2DP: case BluetoothProfile.A2DP:
synchronized (mConnectedDevices) {
synchronized (mA2dpAvrcpLock) { synchronized (mA2dpAvrcpLock) {
mA2dp = (BluetoothA2dp) proxy; mA2dp = (BluetoothA2dp) proxy;
deviceList = mA2dp.getConnectedDevices(); deviceList = mA2dp.getConnectedDevices();
if (deviceList.size() > 0) { if (deviceList.size() > 0) {
btDevice = deviceList.get(0); btDevice = deviceList.get(0);
synchronized (mConnectedDevices) {
int state = mA2dp.getConnectionState(btDevice); int state = mA2dp.getConnectionState(btDevice);
int delay = checkSendBecomingNoisyIntent( int delay = checkSendBecomingNoisyIntent(
AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,
@ -2976,9 +2977,9 @@ public class AudioService extends IAudioService.Stub {
public void onServiceDisconnected(int profile) { public void onServiceDisconnected(int profile) {
switch(profile) { switch(profile) {
case BluetoothProfile.A2DP: case BluetoothProfile.A2DP:
synchronized (mConnectedDevices) {
synchronized (mA2dpAvrcpLock) { synchronized (mA2dpAvrcpLock) {
mA2dp = null; mA2dp = null;
synchronized (mConnectedDevices) {
if (mConnectedDevices.containsKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)) { if (mConnectedDevices.containsKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)) {
makeA2dpDeviceUnavailableNow( makeA2dpDeviceUnavailableNow(
mConnectedDevices.get(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)); mConnectedDevices.get(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP));