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

Merge "Fix Tv source audio device adjust volume, and audio is breaks up intermittently." am: 67dccd5e64 am: 9b17bea1e0 am: 812ab29002

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

Change-Id: I6b284e6912cd2e712a50210c17c93a3455a656c6
This commit is contained in:
Treehugger Robot
2021-10-26 08:12:44 +00:00
committed by Automerger Merge Worker
parent d5fe948f23 812ab29002
commit 2a1e12794b
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -1075,17 +1075,22 @@ class TvInputHardwareManager implements TvInputHal.Callback {
} }
if (shouldRecreateAudioPatch) { if (shouldRecreateAudioPatch) {
mCommittedVolume = volume; mCommittedVolume = volume;
if (mAudioPatch != null) { // only recreate if something was updated or audioPath is null
mAudioManager.releaseAudioPatch(mAudioPatch); if (mAudioPatch == null || sinkUpdated ||sourceUpdated ) {
} if (mAudioPatch != null) {
mAudioManager.createAudioPatch( mAudioManager.releaseAudioPatch(mAudioPatch);
audioPatchArray[0] = null;
}
mAudioManager.createAudioPatch(
audioPatchArray, audioPatchArray,
new AudioPortConfig[] { sourceConfig }, new AudioPortConfig[] { sourceConfig },
sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()])); sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()]));
mAudioPatch = audioPatchArray[0]; mAudioPatch = audioPatchArray[0];
if (sourceGainConfig != null) {
mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig);
} }
}
if (sourceGainConfig != null) {
mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig);
} }
} }