From 2d12628ecc78fdbd5c04bf40d2110c5cc91a9e58 Mon Sep 17 00:00:00 2001
From: Jin Seok Park <jinpark@google.com>
Date: Tue, 15 Jun 2021 11:37:10 +0900
Subject: [PATCH] Check nullity of ResultReceiver

Bug: 182164496
Test: N/A
Change-Id: I96bdef1c79f8f91d33d6a6a734bc94e162a5ea33
---
 apex/media/framework/java/android/media/MediaSession2.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apex/media/framework/java/android/media/MediaSession2.java b/apex/media/framework/java/android/media/MediaSession2.java
index 7697359e7caf2..e76d61cf89653 100644
--- a/apex/media/framework/java/android/media/MediaSession2.java
+++ b/apex/media/framework/java/android/media/MediaSession2.java
@@ -469,7 +469,9 @@ public class MediaSession2 implements AutoCloseable {
         }
         mCallbackExecutor.execute(() -> {
             if (!controllerInfo.removeRequestedCommandSeqNumber(seq)) {
-                resultReceiver.send(RESULT_INFO_SKIPPED, null);
+                if (resultReceiver != null) {
+                    resultReceiver.send(RESULT_INFO_SKIPPED, null);
+                }
                 return;
             }
             Session2Command.Result result = mCallback.onSessionCommand(