commit d05f67f9721e1f9194a1f57cf7481b4be65366b3
author Yuncheol Heo <ycheo@google.com> Fri Jul 11 16:06:40 2014 +0900
committer Yuncheol Heo <ycheo@google.com> Fri Jul 11 20:07:50 2014 +0900
tree e36a60f25b0bd75b3ff9af483680c598f69ee49b
parent 04dc9953b48e8689ddd61ba32f82df7bc138f2a2

Handle <Feature Abort> after <System Audio Mode Request>.

- Fix some wrong return values.

Bug: 15841647
Change-Id: Ia4596e87204196b48429d55da4945f84de51a07b

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 8adb07b..923b87d 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -540,7 +540,7 @@
         assertRunOnServiceThread();
         HdmiCecDeviceInfo avr = getAvrDeviceInfo();
         if (avr == null) {
-            invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE);
+            invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
             return;
         }
 

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

diff --git a/services/core/java/com/android/server/hdmi/SystemAudioAction.java b/services/core/java/com/android/server/hdmi/SystemAudioAction.java
index 01ba9cb..86895cc 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioAction.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioAction.java
@@ -78,7 +78,7 @@
                     addTimer(mState, mTargetAudioStatus ? ON_TIMEOUT_MS : OFF_TIMEOUT_MS);
                 } else {
                     setSystemAudioMode(false);
-                    finishWithCallback(HdmiControlManager.RESULT_EXCEPTION);
+                    finishWithCallback(HdmiControlManager.RESULT_COMMUNICATION_FAILED);
                 }
             }
         });
@@ -102,7 +102,12 @@
     final boolean processCommand(HdmiCecMessage cmd) {
         switch (mState) {
             case STATE_WAIT_FOR_SET_SYSTEM_AUDIO_MODE:
-                // TODO: Handle <FeatureAbort> of <SystemAudioModeRequest>
+                if (cmd.getOpcode() == Constants.MESSAGE_FEATURE_ABORT
+                        && cmd.getParams()[0] == Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST) {
+                    setSystemAudioMode(false);
+                    finishWithCallback(HdmiControlManager.RESULT_EXCEPTION);
+                    return true;
+                }
                 if (cmd.getOpcode() != Constants.MESSAGE_SET_SYSTEM_AUDIO_MODE
                         || !HdmiUtils.checkCommandSource(cmd, mAvrLogicalAddress, TAG)) {
                     return false;