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

Revert "AudioService: synchronize BT_SCO on and A2DP or LE suspended states"

Browse Source 
This reverts commit c0184adb64.
Bug 281786703
Test: make

Change-Id: I81bda9127c951850adcda43c010fe3d560395dd4
This commit is contained in:
Eric Laurent
2023-05-11 13:33:51 +02:00
parent 50c8a39b51
commit 7282eb5e2e
6 changed files with 17 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/AudioManager.java
View File

@@ -3730,12 +3730,7 @@ public class AudioManager {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(Manifest.permission.BLUETOOTH_STACK)
public void setA2dpSuspended(boolean enable) {
final IAudioService service = getService();
try {
service.setA2dpSuspended(enable);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
AudioSystem.setParameters("A2dpSuspended=" + enable);
}
/**
@@ -3748,12 +3743,7 @@ public class AudioManager {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(Manifest.permission.BLUETOOTH_STACK)
public void setLeAudioSuspended(boolean enable) {
final IAudioService service = getService();
try {
service.setLeAudioSuspended(enable);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
AudioSystem.setParameters("LeAudioSuspended=" + enable);
}
/**

6
media/java/android/media/IAudioService.aidl
View File

@@ -231,12 +231,6 @@ interface IAudioService {
void setBluetoothScoOn(boolean on);
@EnforcePermission("BLUETOOTH_STACK")
void setA2dpSuspended(boolean on);
@EnforcePermission("BLUETOOTH_STACK")
void setLeAudioSuspended(boolean enable);
boolean isBluetoothScoOn();
void setBluetoothA2dpOn(boolean on);

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

@@ -209,7 +209,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
private void init() {
setupMessaging(mContext);
initAudioHalBluetoothState();
initRoutingStrategyIds();
mPreferredCommunicationDevice = null;
updateActiveCommunicationDevice();
@@ -865,100 +864,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
}
// Current Bluetooth SCO audio active state indicated by BtHelper via setBluetoothScoOn().
@GuardedBy("mDeviceStateLock")
/**
* Current Bluetooth SCO audio active state indicated by BtHelper via setBluetoothScoOn().
*/
private boolean mBluetoothScoOn;
// value of BT_SCO parameter currently applied to audio HAL.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothScoOnApplied;
// A2DP suspend state requested by AudioManager.setA2dpSuspended() API.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothA2dpSuspendedExt;
// A2DP suspend state requested by AudioDeviceInventory.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothA2dpSuspendedInt;
// value of BT_A2dpSuspendedSCO parameter currently applied to audio HAL.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothA2dpSuspendedApplied;
// LE Audio suspend state requested by AudioManager.setLeAudioSuspended() API.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothLeSuspendedExt;
// LE Audio suspend state requested by AudioDeviceInventory.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothLeSuspendedInt;
// value of LeAudioSuspended parameter currently applied to audio HAL.
@GuardedBy("mDeviceStateLock")
private boolean mBluetoothLeSuspendedApplied;
private void initAudioHalBluetoothState() {
mBluetoothScoOnApplied = false;
AudioSystem.setParameters("BT_SCO=off");
mBluetoothA2dpSuspendedApplied = false;
AudioSystem.setParameters("A2dpSuspended=false");
mBluetoothLeSuspendedApplied = false;
AudioSystem.setParameters("LeAudioSuspended=false");
}
@GuardedBy("mDeviceStateLock")
private void updateAudioHalBluetoothState() {
if (mBluetoothScoOn != mBluetoothScoOnApplied) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "updateAudioHalBluetoothState() mBluetoothScoOn: "
+ mBluetoothScoOn + ", mBluetoothScoOnApplied: " + mBluetoothScoOnApplied);
}
if (mBluetoothScoOn) {
if (!mBluetoothA2dpSuspendedApplied) {
AudioSystem.setParameters("A2dpSuspended=true");
mBluetoothA2dpSuspendedApplied = true;
}
if (!mBluetoothLeSuspendedApplied) {
AudioSystem.setParameters("LeAudioSuspended=true");
mBluetoothLeSuspendedApplied = true;
}
AudioSystem.setParameters("BT_SCO=on");
} else {
AudioSystem.setParameters("BT_SCO=off");
}
mBluetoothScoOnApplied = mBluetoothScoOn;
}
if (!mBluetoothScoOnApplied) {
if ((mBluetoothA2dpSuspendedExt || mBluetoothA2dpSuspendedInt)
!= mBluetoothA2dpSuspendedApplied) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "updateAudioHalBluetoothState() mBluetoothA2dpSuspendedExt: "
+ mBluetoothA2dpSuspendedExt
+ ", mBluetoothA2dpSuspendedInt: " + mBluetoothA2dpSuspendedInt
+ ", mBluetoothA2dpSuspendedApplied: "
+ mBluetoothA2dpSuspendedApplied);
}
mBluetoothA2dpSuspendedApplied =
mBluetoothA2dpSuspendedExt || mBluetoothA2dpSuspendedInt;
if (mBluetoothA2dpSuspendedApplied) {
AudioSystem.setParameters("A2dpSuspended=true");
} else {
AudioSystem.setParameters("A2dpSuspended=false");
}
}
if ((mBluetoothLeSuspendedExt || mBluetoothLeSuspendedInt)
!= mBluetoothLeSuspendedApplied) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "updateAudioHalBluetoothState() mBluetoothLeSuspendedExt: "
+ mBluetoothLeSuspendedExt
+ ", mBluetoothLeSuspendedInt: " + mBluetoothLeSuspendedInt
+ ", mBluetoothLeSuspendedApplied: " + mBluetoothLeSuspendedApplied);
}
mBluetoothLeSuspendedApplied =
mBluetoothLeSuspendedExt || mBluetoothLeSuspendedInt;
if (mBluetoothLeSuspendedApplied) {
AudioSystem.setParameters("LeAudioSuspended=true");
} else {
AudioSystem.setParameters("LeAudioSuspended=false");
}
}
}
}
/*package*/ void setBluetoothScoOn(boolean on, String eventSource) {
if (AudioService.DEBUG_COMM_RTE) {
@@ -966,67 +875,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
synchronized (mDeviceStateLock) {
mBluetoothScoOn = on;
updateAudioHalBluetoothState();
postUpdateCommunicationRouteClient(eventSource);
}
}
/*package*/ void setA2dpSuspended(boolean enable, boolean internal, String eventSource) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "setA2dpSuspended source: " + eventSource + ", enable: "
+ enable + ", internal: " + internal
+ ", mBluetoothA2dpSuspendedInt: " + mBluetoothA2dpSuspendedInt
+ ", mBluetoothA2dpSuspendedExt: " + mBluetoothA2dpSuspendedExt);
}
synchronized (mDeviceStateLock) {
if (internal) {
mBluetoothA2dpSuspendedInt = enable;
} else {
mBluetoothA2dpSuspendedExt = enable;
}
updateAudioHalBluetoothState();
}
}
/*package*/ void clearA2dpSuspended() {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "clearA2dpSuspended");
}
synchronized (mDeviceStateLock) {
mBluetoothA2dpSuspendedInt = false;
mBluetoothA2dpSuspendedExt = false;
updateAudioHalBluetoothState();
}
}
/*package*/ void setLeAudioSuspended(boolean enable, boolean internal, String eventSource) {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "setLeAudioSuspended source: " + eventSource + ", enable: "
+ enable + ", internal: " + internal
+ ", mBluetoothLeSuspendedInt: " + mBluetoothA2dpSuspendedInt
+ ", mBluetoothLeSuspendedExt: " + mBluetoothA2dpSuspendedExt);
}
synchronized (mDeviceStateLock) {
if (internal) {
mBluetoothLeSuspendedInt = enable;
} else {
mBluetoothLeSuspendedExt = enable;
}
updateAudioHalBluetoothState();
}
}
/*package*/ void clearLeAudioSuspended() {
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "clearLeAudioSuspended");
}
synchronized (mDeviceStateLock) {
mBluetoothLeSuspendedInt = false;
mBluetoothLeSuspendedExt = false;
updateAudioHalBluetoothState();
}
}
/*package*/ AudioRoutesInfo startWatchingRoutes(IAudioRoutesObserver observer) {
synchronized (mDeviceStateLock) {
return mDeviceInventory.startWatchingRoutes(observer);
@@ -2168,6 +2020,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
"updateCommunicationRoute, preferredCommunicationDevice: "
+ preferredCommunicationDevice + " eventSource: " + eventSource)));
if (preferredCommunicationDevice == null
|| preferredCommunicationDevice.getType() != AudioDeviceInfo.TYPE_BLUETOOTH_SCO) {
AudioSystem.setParameters("BT_SCO=off");
} else {
AudioSystem.setParameters("BT_SCO=on");
}
if (preferredCommunicationDevice == null) {
AudioDeviceAttributes defaultDevice = getDefaultCommunicationDevice();
if (defaultDevice != null) {

10
services/core/java/com/android/server/audio/AudioDeviceInventory.java
View File

@@ -1477,7 +1477,7 @@ public class AudioDeviceInventory {
}
// Reset A2DP suspend state each time a new sink is connected
mDeviceBroker.clearA2dpSuspended();
mAudioSystem.setParameters("A2dpSuspended=false");
// The convention for head tracking sensors associated with A2DP devices is to
// use a UUID derived from the MAC address as follows:
@@ -1750,8 +1750,7 @@ public class AudioDeviceInventory {
private void makeA2dpDeviceUnavailableLater(String address, int delayMs) {
// prevent any activity on the A2DP audio output to avoid unwanted
// reconnection of the sink.
mDeviceBroker.setA2dpSuspended(
true /*enable*/, true /*internal*/, "makeA2dpDeviceUnavailableLater");
mAudioSystem.setParameters("A2dpSuspended=true");
// retrieve DeviceInfo before removing device
final String deviceKey =
DeviceInfo.makeDeviceListKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, address);
@@ -1898,7 +1897,7 @@ public class AudioDeviceInventory {
"LE Audio device addr=" + address + " now available").printLog(TAG));
}
// Reset LEA suspend state each time a new sink is connected
mDeviceBroker.clearLeAudioSuspended();
mAudioSystem.setParameters("LeAudioSuspended=false");
UUID sensorUuid = UuidUtils.uuidFromAudioDeviceAttributes(ada);
mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),
@@ -1953,8 +1952,7 @@ public class AudioDeviceInventory {
private void makeLeAudioDeviceUnavailableLater(String address, int device, int delayMs) {
// prevent any activity on the LEA output to avoid unwanted
// reconnection of the sink.
mDeviceBroker.setLeAudioSuspended(
true /*enable*/, true /*internal*/, "makeLeAudioDeviceUnavailableLater");
mAudioSystem.setParameters("LeAudioSuspended=true");
// the device will be made unavailable later, so consider it disconnected right away
mConnectedDevices.remove(DeviceInfo.makeDeviceListKey(device, address));
// send the delayed message to make the device unavailable later

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

@@ -6405,26 +6405,6 @@ public class AudioService extends IAudioService.Stub
mDeviceBroker.setBluetoothScoOn(on, eventSource);
}
/** @see AudioManager#setA2dpSuspended(boolean) */
@android.annotation.EnforcePermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setA2dpSuspended(boolean enable) {
super.setA2dpSuspended_enforcePermission();
final String eventSource = new StringBuilder("setA2dpSuspended(").append(enable)
.append(") from u/pid:").append(Binder.getCallingUid()).append("/")
.append(Binder.getCallingPid()).toString();
mDeviceBroker.setA2dpSuspended(enable, false /*internal*/, eventSource);
}
/** @see AudioManager#setA2dpSuspended(boolean) */
@android.annotation.EnforcePermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setLeAudioSuspended(boolean enable) {
super.setLeAudioSuspended_enforcePermission();
final String eventSource = new StringBuilder("setLeAudioSuspended(").append(enable)
.append(") from u/pid:").append(Binder.getCallingUid()).append("/")
.append(Binder.getCallingPid()).toString();
mDeviceBroker.setLeAudioSuspended(enable, false /*internal*/, eventSource);
}
/** @see AudioManager#isBluetoothScoOn()
* Note that it doesn't report internal state, but state seen by apps (which may have
* called setBluetoothScoOn() */

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

@@ -445,8 +445,8 @@ public class BtHelper {
/*package*/ synchronized void resetBluetoothSco() {
mScoAudioState = SCO_STATE_INACTIVE;
broadcastScoConnectionState(AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
mDeviceBroker.clearA2dpSuspended();
mDeviceBroker.clearLeAudioSuspended();
AudioSystem.setParameters("A2dpSuspended=false");
AudioSystem.setParameters("LeAudioSuspended=false");
mDeviceBroker.setBluetoothScoOn(false, "resetBluetoothSco");
}