From 03611473bc1d13f8e55ac92e37a9716c2fd8e412 Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Thu, 6 Nov 2014 17:21:04 +0900
Subject: [PATCH] CEC: Allow no parameters with <System Audio Mode Request>.

Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
---
 .../com/android/server/hdmi/HdmiCecMessageValidator.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
index f1529a73ddd9..53740fef38c0 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
@@ -79,7 +79,7 @@ public final class HdmiCecMessageValidator {
         addValidationInfo(Constants.MESSAGE_SET_STREAM_PATH,
                 physicalAddressValidator, DEST_BROADCAST);
         addValidationInfo(Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST,
-                physicalAddressValidator, DEST_DIRECT);
+                new SystemAudioModeRequestValidator(), DEST_DIRECT);
 
         // Messages have no parameter.
         FixedLengthValidator noneValidator = new FixedLengthValidator(0);
@@ -303,6 +303,17 @@ public final class HdmiCecMessageValidator {
         }
     }
 
+    private class SystemAudioModeRequestValidator extends PhysicalAddressValidator {
+        @Override
+        public int isValid(byte[] params) {
+            // TV can send <System Audio Mode Request> with no parameters to terminate system audio.
+            if (params.length == 0) {
+                return OK;
+            }
+            return super.isValid(params);
+        }
+    }
+
     private class ReportPhysicalAddressValidator implements ParameterValidator {
         @Override
         public int isValid(byte[] params) {
-- 
2.11.0