Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91f6e874 authored by Jin Seok Park's avatar Jin Seok Park Committed by Automerger Merge Worker
Browse files

Merge "Check nullity of ResultReceiver" into sc-dev am: 0f7813ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972761

Change-Id: I93c4f1693a5105869ee44e4f4579a41eb5543e95
parents 30a73474 0f7813ec

apex/media/framework/java/android/media/MediaSession2.java

+3 −1
Original line number Diff line number Diff line
@@ -469,7 +469,9 @@ public class MediaSession2 implements AutoCloseable { 
        }

        mCallbackExecutor.execute(() -> {

            if (!controllerInfo.removeRequestedCommandSeqNumber(seq)) {

                if (resultReceiver != null) {

                    resultReceiver.send(RESULT_INFO_SKIPPED, null);

                }

                return;

            }

            Session2Command.Result result = mCallback.onSessionCommand(