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

Commit 3ecfdd4b authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "TvInputHardwareManager: always try patch recreate if null" am:... 

Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d am: f69aecc9 am: 36610d33 am: c6d4bc2b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4371c1579426514a0e00977c229a1fbe60d14dc8
parents c97e6434 c6d4bc2b

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -977,7 +977,7 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
            AudioPortConfig sourceConfig = mAudioSource.activeConfig();

            AudioPortConfig sourceConfig = mAudioSource.activeConfig();

            List<AudioPortConfig> sinkConfigs = new ArrayList<>();

            List<AudioPortConfig> sinkConfigs = new ArrayList<>();

            AudioPatch[] audioPatchArray = new AudioPatch[] { mAudioPatch };

            AudioPatch[] audioPatchArray = new AudioPatch[] { mAudioPatch };

            boolean shouldRecreateAudioPatch = sourceUpdated || sinkUpdated;

            boolean shouldRecreateAudioPatch = sourceUpdated || sinkUpdated || mAudioPatch == null;





            for (AudioDevicePort audioSink : mAudioSink) {

            for (AudioDevicePort audioSink : mAudioSink) {

                AudioPortConfig sinkConfig = audioSink.activeConfig();

                AudioPortConfig sinkConfig = audioSink.activeConfig();