From d9b319e0d2769f5125a88389e37799811acdb9fd Mon Sep 17 00:00:00 2001
From: Venkatarama Avadhani <venkatarama.avadhani@ittiam.com>
Date: Mon, 27 Jun 2022 12:19:42 +0530
Subject: [PATCH] CEC: Do not allow null callback

Do not allow oneTouchPlay and getDisplayStatus methods to be called
with null callback as an argument.

Bug: 236687418
Test: None
Change-Id: I9f1b3ec5c1a44fd588068881febd35d34930f031
---
 core/java/android/hardware/hdmi/HdmiPlaybackClient.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/hardware/hdmi/HdmiPlaybackClient.java b/core/java/android/hardware/hdmi/HdmiPlaybackClient.java
index d06bc1d2053da..3e41d63b0365d 100644
--- a/core/java/android/hardware/hdmi/HdmiPlaybackClient.java
+++ b/core/java/android/hardware/hdmi/HdmiPlaybackClient.java
@@ -122,6 +122,9 @@ public final class HdmiPlaybackClient extends HdmiClient {
     }
 
     private IHdmiControlCallback getCallbackWrapper(final OneTouchPlayCallback callback) {
+        if (callback == null) {
+            throw new IllegalArgumentException("OneTouchPlayCallback cannot be null.");
+        }
         return new IHdmiControlCallback.Stub() {
             @Override
             public void onComplete(int result) {
@@ -131,6 +134,9 @@ public final class HdmiPlaybackClient extends HdmiClient {
     }
 
     private IHdmiControlCallback getCallbackWrapper(final DisplayStatusCallback callback) {
+        if (callback == null) {
+            throw new IllegalArgumentException("DisplayStatusCallback cannot be null.");
+        }
         return new IHdmiControlCallback.Stub() {
             @Override
             public void onComplete(int status) {