From 719b05d7eba5a0388dcef36fce209b60feef8abe Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Mon, 18 Feb 2019 11:58:49 +0900
Subject: [PATCH] Fix NPE in MediaController2

Test: build
Change-Id: Ibd48b1515afe639f58fd20198b67e828b2c20106
---
 media/apex/java/android/media/MediaController2.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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(