summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-12-19 23:58:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-19 23:58:12 +0000
commit2c8c47daefc881c5603689be39b10cb93a0cabdf (patch)
treeb2623c89a07d5c01e75f406d72d911b0e2f23847 /services
parent1ed9a88ec3a1a1d9f418ae0b6f1e77e7b7dd99a3 (diff)
parenta95794bc4fbc5cd19561e447535b99bbae00de25 (diff)
downloadframeworks_base-2c8c47daefc881c5603689be39b10cb93a0cabdf.zip
frameworks_base-2c8c47daefc881c5603689be39b10cb93a0cabdf.tar.gz
frameworks_base-2c8c47daefc881c5603689be39b10cb93a0cabdf.tar.bz2
Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev
Diffstat (limited to 'services')
-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);