commit d240a8ca7cb1208f15236a76a8e873620b0f718b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 18 06:53:13 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 18 06:53:13 2019 +0000
tree 2da71590aefea046ecb9c386e0159b9965504b24
parent 916c0689a0ba467bc949f38b6f9c951290a17868
parent 719b05d7eba5a0388dcef36fce209b60feef8abe

Merge "Fix NPE in MediaController2"

media/apex/java/android/media/MediaController2.java

diff --git a/media/apex/java/android/media/MediaController2.java b/media/apex/java/android/media/MediaController2.java
index e85d997..4ea384a 100644
--- a/media/apex/java/android/media/MediaController2.java
+++ b/media/apex/java/android/media/MediaController2.java
@@ -317,7 +317,9 @@
                 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(