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

Commit 15b0e563 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix SystemAudioInitiationActionFromAvr state switching."

parents e746fb17 f39d86e5

services/core/java/com/android/server/hdmi/SystemAudioInitiationActionFromAvr.java

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ public class SystemAudioInitiationActionFromAvr extends HdmiCecFeatureAction { 


    // State that waits for <Active Source> once send <Request Active Source>.

    private static final int STATE_WAITING_FOR_ACTIVE_SOURCE = 1;

    // State that waits for TV supporting Audio System Mode or not

    // once received <Active Source>

    private static final int STATE_WAITING_FOR_TV_SUPPORT = 2;

    @VisibleForTesting

    static final int MAX_RETRY_COUNT = 5;
@@ -60,6 +63,7 @@ public class SystemAudioInitiationActionFromAvr extends HdmiCecFeatureAction { 
                if (physicalAddress != getSourcePath()) {

                    audioSystem().setActiveSource(cmd.getSource(), physicalAddress);

                }

                mState = STATE_WAITING_FOR_TV_SUPPORT;

                queryTvSystemAudioModeSupport();

                return true;

        }