commit b744db87155d6175cf0ebcd58d3f2ddd24ece0d4
author Jinsuk Kim <jinsukkim@google.com> Thu Jan 29 22:41:23 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 29 22:41:23 2015 +0000
tree 2f5b065bf9bcd701cf4cec178e4c0772326f53c2
parent f0569c16517874fe49184b79bf105581a449803f
parent 7e79bdb494b51175d9873f82f4ca8488ac6fccfa

am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()

core/java/android/hardware/hdmi/HdmiRecordSources.java

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 @@
      */
     @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) {