Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a1e1279 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Tv source audio device adjust volume, and audio is breaks up... 

Merge "Fix Tv source audio device adjust volume, and audio is breaks up intermittently." am: 67dccd5e am: 9b17bea1 am: 812ab290

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

Change-Id: I6b284e6912cd2e712a50210c17c93a3455a656c6
parents d5fe948f 812ab290

services/core/java/com/android/server/tv/TvInputHardwareManager.java

+12 −7
Original line number Diff line number Diff line
@@ -1075,19 +1075,24 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
            }

            if (shouldRecreateAudioPatch) {

                mCommittedVolume = volume;

                // only recreate if  something was updated or audioPath is null

                if (mAudioPatch == null || sinkUpdated ||sourceUpdated ) {

                    if (mAudioPatch != null) {

                        mAudioManager.releaseAudioPatch(mAudioPatch);

                        audioPatchArray[0] = null;

                    }

                    mAudioManager.createAudioPatch(

                        audioPatchArray,

                        new AudioPortConfig[] { sourceConfig },

                        sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()]));

                    mAudioPatch = audioPatchArray[0];

                }

             }



            if (sourceGainConfig != null) {

                mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig);

            }

        }

        }



        @Override

        public void setStreamVolume(float volume) throws RemoteException {