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

Merge "AudioDeviceBroker: Fix not setting proper call volume for LE Headset" into udc-dev am: 0eeb400e76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23258556

Change-Id: I16a414daba0d8afd8499b407fc77dbda112f784f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jakub Tyszkowski
2023-05-19 11:45:34 +00:00
committed by Automerger Merge Worker
parent b56de4b6a7 0eeb400e76
commit 99eda4e28e
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,6 +420,20 @@ import java.util.concurrent.atomic.AtomicBoolean;
mBtHelper.stopBluetoothSco(eventSource); mBtHelper.stopBluetoothSco(eventSource);
} }
// In BT classic for communication, the device changes from a2dp to sco device, but for
// LE Audio it stays the same and we must trigger the proper stream volume alignment, if
// LE Audio communication device is activated after the audio system has already switched to
// MODE_IN_CALL mode.
if (isBluetoothLeAudioRequested()) {
final int streamType = mAudioService.getBluetoothContextualVolumeStream();
final int leAudioVolIndex = getVssVolumeForDevice(streamType, device.getInternalType());
final int leAudioMaxVolIndex = getMaxVssVolumeForStream(streamType);
if (AudioService.DEBUG_COMM_RTE) {
Log.v(TAG, "setCommunicationRouteForClient restoring LE Audio device volume lvl.");
}
postSetLeAudioVolumeIndex(leAudioVolIndex, leAudioMaxVolIndex, streamType);
}
updateCommunicationRoute(eventSource); updateCommunicationRoute(eventSource);
} }
@@ -632,6 +646,16 @@ import java.util.concurrent.atomic.AtomicBoolean;
return isDeviceRequestedForCommunication(AudioDeviceInfo.TYPE_BLUETOOTH_SCO); return isDeviceRequestedForCommunication(AudioDeviceInfo.TYPE_BLUETOOTH_SCO);
} }
/**
* Helper method on top of isDeviceRequestedForCommunication() indicating if
* Bluetooth LE Audio communication device is currently requested or not.
* @return true if Bluetooth LE Audio device is requested, false otherwise.
*/
/*package*/ boolean isBluetoothLeAudioRequested() {
return isDeviceRequestedForCommunication(AudioDeviceInfo.TYPE_BLE_HEADSET)
|| isDeviceRequestedForCommunication(AudioDeviceInfo.TYPE_BLE_SPEAKER);
}
/** /**
* Indicates if preferred route selection for communication is Bluetooth SCO. * Indicates if preferred route selection for communication is Bluetooth SCO.
* @return true if Bluetooth SCO is preferred , false otherwise. * @return true if Bluetooth SCO is preferred , false otherwise.