diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-12-20 00:00:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-20 00:00:38 +0000 |
| commit | ed27b72e581aea85d3c9db4284b07c560d326838 (patch) | |
| tree | b48842da037c8b620e9b533dbfba5930f2fa982c | |
| parent | a1bd2d0008e5d9cb563936b7f044d8796c37fb2f (diff) | |
| parent | 2c8c47daefc881c5603689be39b10cb93a0cabdf (diff) | |
| download | frameworks_base-ed27b72e581aea85d3c9db4284b07c560d326838.zip frameworks_base-ed27b72e581aea85d3c9db4284b07c560d326838.tar.gz frameworks_base-ed27b72e581aea85d3c9db4284b07c560d326838.tar.bz2 | |
Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev
automerge: 2c8c47d
* commit '2c8c47daefc881c5603689be39b10cb93a0cabdf':
CEC: Allow no vendor-specific data for <Vendor Command With ID>
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java | 2 |
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); |