Merge "Check nullity of ResultReceiver" into sc-dev

2021-06-15 08:12:52 +00:00
parent 9328e1c7fb 6d62a4711f
commit 0f7813ec5e
1 changed files with 3 additions and 1 deletions
--- 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(