commit f4b66f62d44877de9ddff97dca444fd4c8db9e98
author Amy <amyjojo@google.com> Fri Nov 09 09:52:50 2018 -0800
committer shubang <shubang@google.com> Tue Jan 15 18:10:59 2019 -0800
tree 900ce14148a4b9af19509ac87d5124a591fc5d6c
parent 291a2a3cca66ff417d1805945671f794d93dbf5c

Fix feature abort command handlers.

ag/5483701

Note that we should check if the feature abort is on the message we are
targeting on. There could be some other feature abort show up during the
Action.

Test: manual
Change-Id: Ieac90874595fc3810e0d7a62c06cb113d52323bb

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

diff --git a/services/core/java/com/android/server/hdmi/DetectTvSystemAudioModeSupportAction.java b/services/core/java/com/android/server/hdmi/DetectTvSystemAudioModeSupportAction.java
index 0495ff8..7187319 100644
--- a/services/core/java/com/android/server/hdmi/DetectTvSystemAudioModeSupportAction.java
+++ b/services/core/java/com/android/server/hdmi/DetectTvSystemAudioModeSupportAction.java
@@ -50,8 +50,10 @@
             if (mState != STATE_WAITING_FOR_FEATURE_ABORT) {
                 return false;
             }
-            finishAction(false);
-            return true;
+            if ((cmd.getParams()[0] & 0xFF) == Constants.MESSAGE_SET_SYSTEM_AUDIO_MODE) {
+                finishAction(false);
+                return true;
+            }
         }
         return false;
     }