diff options
| author | 2025-03-03 01:54:33 -0800 | |
|---|---|---|
| committer | 2025-03-03 01:54:33 -0800 | |
| commit | e181252fc4a057d50deef959114efc29daeec70f (patch) | |
| tree | 01c55e64e4463e7f8b29dd17b2ce4f9e3e4d6a0b | |
| parent | 47e40f7ca7403a266c3a21d118e837786655532f (diff) | |
| parent | ef70b87c65bf2587390d70d9db7aa235b60b9abb (diff) | |
Merge "AudioService: fix voice volume adjustments" into main am: ef70b87c65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3513031
Change-Id: I609dfffbf66704100e40f41258b2cac879f1c5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 3cc89a5744c7..5473254ffd8c 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -7695,7 +7695,8 @@ public class AudioService extends IAudioService.Stub return AudioSystem.STREAM_RING; } default: - if (isInCommunication()) { + if (isInCommunication() + || mAudioSystem.isStreamActive(AudioManager.STREAM_VOICE_CALL, 0)) { if (!replaceStreamBtSco() && mBtCommDeviceActive.get() == BT_COMM_DEVICE_ACTIVE_SCO) { if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: Forcing STREAM_BLUETOOTH_SCO"); |