summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-12-20 00:07:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-20 00:07:49 +0000
commit32328b5cec14323dd31cf906aaeb088caf110a1d (patch)
treeff4a8e970a78e574a77bba8df4bd1f41e82b50c6
parent0dd962db3e66e725241565bb6e8d45d8383e3aeb (diff)
parentf6ec9f53639719b6d9ac981a2b9fb67716c00fc6 (diff)
downloadframeworks_base-32328b5cec14323dd31cf906aaeb088caf110a1d.zip
frameworks_base-32328b5cec14323dd31cf906aaeb088caf110a1d.tar.gz
frameworks_base-32328b5cec14323dd31cf906aaeb088caf110a1d.tar.bz2
am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev automerge: 2c8c47d
automerge: f6ec9f5 * commit 'f6ec9f53639719b6d9ac981a2b9fb67716c00fc6': 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 53740fe..fe50666 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);