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

Revert "AudioDeviceBroker: fix deadlock with setA2dpSuspended"

Browse Source 
This reverts commit 2bd07ff1da.
Bug: 281786703
Test: make

Change-Id: I5ed93786daf6bd34a249d231b2831aab158d6476
This commit is contained in:
Eric Laurent
2023-05-11 13:32:59 +02:00
parent 322d69469c
commit 50c8a39b51
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/audio/AudioDeviceBroker.java
View File

@@ -971,10 +971,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
}
/*package*/ void postSetA2dpSuspended(boolean enable, String eventSource) {
sendILMsgNoDelay(MSG_IL_SET_A2DP_SUSPENDED, SENDMSG_QUEUE, (enable ? 1 : 0), eventSource);
}
/*package*/ void setA2dpSuspended(boolean enable, boolean internal, String eventSource) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "setA2dpSuspended source: " + eventSource + ", enable: "
@@ -1003,11 +999,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
}
/*package*/ void postSetLeAudioSuspended(boolean enable, String eventSource) {
sendILMsgNoDelay(
MSG_IL_SET_LEAUDIO_SUSPENDED, SENDMSG_QUEUE, (enable ? 1 : 0), eventSource);
}
/*package*/ void setLeAudioSuspended(boolean enable, boolean internal, String eventSource) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "setLeAudioSuspended source: " + eventSource + ", enable: "
@@ -1821,12 +1812,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
final int capturePreset = msg.arg1;
mDeviceInventory.onSaveClearPreferredDevicesForCapturePreset(capturePreset);
} break;
case MSG_IL_SET_A2DP_SUSPENDED: {
setA2dpSuspended((msg.arg1 == 1), false /*internal*/, (String) msg.obj);
} break;
case MSG_IL_SET_LEAUDIO_SUSPENDED: {
setLeAudioSuspended((msg.arg1 == 1), false /*internal*/, (String) msg.obj);
} break;
case MSG_L_NOTIFY_PREFERRED_AUDIOPROFILE_APPLIED: {
final BluetoothDevice btDevice = (BluetoothDevice) msg.obj;
BtHelper.onNotifyPreferredAudioProfileApplied(btDevice);
@@ -1905,8 +1890,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
private static final int MSG_IL_SAVE_NDEF_DEVICE_FOR_STRATEGY = 47;
private static final int MSG_IL_SAVE_REMOVE_NDEF_DEVICE_FOR_STRATEGY = 48;
private static final int MSG_IL_BTLEAUDIO_TIMEOUT = 49;
private static final int MSG_IL_SET_A2DP_SUSPENDED = 50;
private static final int MSG_IL_SET_LEAUDIO_SUSPENDED = 51;
private static final int MSG_L_NOTIFY_PREFERRED_AUDIOPROFILE_APPLIED = 52;

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

@@ -6412,7 +6412,7 @@ public class AudioService extends IAudioService.Stub
final String eventSource = new StringBuilder("setA2dpSuspended(").append(enable)
.append(") from u/pid:").append(Binder.getCallingUid()).append("/")
.append(Binder.getCallingPid()).toString();
mDeviceBroker.postSetA2dpSuspended(enable, eventSource);
mDeviceBroker.setA2dpSuspended(enable, false /*internal*/, eventSource);
}
/** @see AudioManager#setA2dpSuspended(boolean) */
@@ -6422,7 +6422,7 @@ public class AudioService extends IAudioService.Stub
final String eventSource = new StringBuilder("setLeAudioSuspended(").append(enable)
.append(") from u/pid:").append(Binder.getCallingUid()).append("/")
.append(Binder.getCallingPid()).toString();
mDeviceBroker.postSetLeAudioSuspended(enable, eventSource);
mDeviceBroker.setLeAudioSuspended(enable, false /*internal*/, eventSource);
}
/** @see AudioManager#isBluetoothScoOn()