Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev

2015-01-29 22:22:30 +00:00
parent 3f92347424 c8aaaef20f
commit dbdaea0c6d
1 changed files with 2 additions and 0 deletions
--- 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) {