commit 15b0e563468f9e3c5618aa6b058bb3e51ea684b6
author Amy Zhang <amyjojo@google.com> Thu Sep 20 21:39:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 21:39:52 2018 +0000
tree 454887e12c67a9b3b31739c8d8a809e6b30d5caf
parent e746fb17a645434c6ad3fb5fd9c6247c43b4b5ba
parent f39d86e5aac46dc14c80c64a98722472c76be90f

Merge "Fix SystemAudioInitiationActionFromAvr state switching."

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

diff --git a/services/core/java/com/android/server/hdmi/SystemAudioInitiationActionFromAvr.java b/services/core/java/com/android/server/hdmi/SystemAudioInitiationActionFromAvr.java
index d4932f9..2fdcb51 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioInitiationActionFromAvr.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioInitiationActionFromAvr.java
@@ -25,6 +25,9 @@
 
     // 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 @@
                 if (physicalAddress != getSourcePath()) {
                     audioSystem().setActiveSource(cmd.getSource(), physicalAddress);
                 }
+                mState = STATE_WAITING_FOR_TV_SUPPORT;
                 queryTvSystemAudioModeSupport();
                 return true;
         }