diff --git a/media/apex/java/android/media/MediaController2.java b/media/apex/java/android/media/MediaController2.java index e85d997749869..4ea384ac70b26 100644 --- a/media/apex/java/android/media/MediaController2.java +++ b/media/apex/java/android/media/MediaController2.java @@ -317,7 +317,9 @@ public class MediaController2 implements AutoCloseable { isCanceled = !mRequestedCommandSeqNumbers.remove(seq); } if (isCanceled) { - resultReceiver.send(RESULT_INFO_SKIPPED, null); + if (resultReceiver != null) { + resultReceiver.send(RESULT_INFO_SKIPPED, null); + } return; } Session2Command.Result result = mCallback.onSessionCommand(