diff options
author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-29 22:37:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 22:37:01 +0000 |
commit | 7e79bdb494b51175d9873f82f4ca8488ac6fccfa (patch) | |
tree | 97902190765f7fcbc63208e4fa12be81c62c9b88 /core/java/android/hardware | |
parent | e7ff01ecc5c0ceda498dd476cb29ee663f1968dc (diff) | |
parent | eb2c4a07a118bb6f41455ffd14f35086298675cd (diff) | |
download | frameworks_base-7e79bdb494b51175d9873f82f4ca8488ac6fccfa.zip frameworks_base-7e79bdb494b51175d9873f82f4ca8488ac6fccfa.tar.gz frameworks_base-7e79bdb494b51175d9873f82f4ca8488ac6fccfa.tar.bz2 |
am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
CEC: Do null/empty check against the parameter for checkRecordSource()
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r-- | core/java/android/hardware/hdmi/HdmiRecordSources.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiRecordSources.java b/core/java/android/hardware/hdmi/HdmiRecordSources.java index 922b8e7..7e94b89 100644 --- a/core/java/android/hardware/hdmi/HdmiRecordSources.java +++ b/core/java/android/hardware/hdmi/HdmiRecordSources.java @@ -759,6 +759,8 @@ public final class HdmiRecordSources { */ @SystemApi public static boolean checkRecordSource(byte[] recordSource) { + if (recordSource == null || recordSource.length == 0) return false; + int recordSourceType = recordSource[0]; int extraDataSize = recordSource.length - 1; switch (recordSourceType) { |