summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jinsuk Kim <jinsukkim@google.com> 2014-12-20 00:06:25 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-20 00:06:25 +0000
commitf6ec9f53639719b6d9ac981a2b9fb67716c00fc6 (patch)
tree40fb86d928c28f2ed83dbdcf7135d1861541ad62
parent6d1cb48da45f70c2e8f73277bfb219e80a329778 (diff)
parented27b72e581aea85d3c9db4284b07c560d326838 (diff)
am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev automerge: 2c8c47d
* commit 'ed27b72e581aea85d3c9db4284b07c560d326838': CEC: Allow no vendor-specific data for <Vendor Command With ID>
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
index 53740fef38c0..fe50666a8358 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
@@ -142,7 +142,7 @@ public final class HdmiCecMessageValidator {
addValidationInfo(Constants.MESSAGE_VENDOR_COMMAND,
maxLengthValidator, DEST_DIRECT | SRC_UNREGISTERED);
addValidationInfo(Constants.MESSAGE_VENDOR_COMMAND_WITH_ID,
- maxLengthValidator, DEST_ALL | SRC_UNREGISTERED);
+ new VariableLengthValidator(4, 14), DEST_ALL | SRC_UNREGISTERED);
addValidationInfo(Constants.MESSAGE_VENDOR_REMOTE_BUTTON_DOWN,
maxLengthValidator, DEST_ALL | SRC_UNREGISTERED);