diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-29 22:33:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 22:33:22 +0000 |
| commit | 17427167e700a0c3b331d15f3110f50d1ff3c1c9 (patch) | |
| tree | 5848633da2ac860b83eadf6eaa96b6350811add7 | |
| parent | 06c8608431c5219ada48891428be3935c33a20ed (diff) | |
| parent | dbdaea0c6d44ead142f42ac060af2f5cd7f942ac (diff) | |
| download | frameworks_base-17427167e700a0c3b331d15f3110f50d1ff3c1c9.zip frameworks_base-17427167e700a0c3b331d15f3110f50d1ff3c1c9.tar.gz frameworks_base-17427167e700a0c3b331d15f3110f50d1ff3c1c9.tar.bz2 | |
am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit 'dbdaea0c6d44ead142f42ac060af2f5cd7f942ac':
CEC: Do null/empty check against the parameter for checkRecordSource()
| -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) { |