Merge "CEC: Do not allow null callback" am: a36bae6e00

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: Ibc7fec5ef75869721aeff35055b73b76185f3717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-29 07:56:18 +00:00
committed by Automerger Merge Worker

View File

@@ -122,6 +122,9 @@ public final class HdmiPlaybackClient extends HdmiClient {
} }
private IHdmiControlCallback getCallbackWrapper(final OneTouchPlayCallback callback) { private IHdmiControlCallback getCallbackWrapper(final OneTouchPlayCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("OneTouchPlayCallback cannot be null.");
}
return new IHdmiControlCallback.Stub() { return new IHdmiControlCallback.Stub() {
@Override @Override
public void onComplete(int result) { public void onComplete(int result) {
@@ -131,6 +134,9 @@ public final class HdmiPlaybackClient extends HdmiClient {
} }
private IHdmiControlCallback getCallbackWrapper(final DisplayStatusCallback callback) { private IHdmiControlCallback getCallbackWrapper(final DisplayStatusCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("DisplayStatusCallback cannot be null.");
}
return new IHdmiControlCallback.Stub() { return new IHdmiControlCallback.Stub() {
@Override @Override
public void onComplete(int status) { public void onComplete(int status) {