Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ee5cd13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CEC: Do not allow null callback" am: a36bae6e am: 4a6e08d4 

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



Change-Id: I0923d607a1aa766ba46d4f159b2d060ec37c66fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da1d4cce 4a6e08d4

core/java/android/hardware/hdmi/HdmiPlaybackClient.java

+6 −0
Original line number Diff line number Diff line
@@ -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) {