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

Commit 71475605 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow onSessionCommand return null"

parents 09d70fb6 6003d8f4

media/java/android/media/MediaController2.java

+3 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ public class MediaController2 implements AutoCloseable { 
                    MediaController2.this, command, args);

            if (resultReceiver != null) {

                if (result == null) {

                    throw new RuntimeException("onSessionCommand shouldn't return null");

                    resultReceiver.send(Session2Command.RESULT_INFO_SKIPPED, null);

                } else {

                    resultReceiver.send(result.getResultCode(), result.getResultData());

                }
@@ -442,8 +442,8 @@ public class MediaController2 implements AutoCloseable { 
         * @param controller the controller for this event

         * @param command the session command

         * @param args optional arguments

         * @return the result for the session command. A runtime exception will be thrown if null

         *         is returned.

         * @return the result for the session command. If {@code null}, RESULT_INFO_SKIPPED

         *         will be sent to the session.

         */

        @Nullable

        public Session2Command.Result onSessionCommand(@NonNull MediaController2 controller,

media/java/android/media/MediaSession2.java

+3 −3
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ public class MediaSession2 implements AutoCloseable { 
                    MediaSession2.this, controllerInfo, command, args);

            if (resultReceiver != null) {

                if (result == null) {

                    throw new RuntimeException("onSessionCommand shouldn't return null");

                    resultReceiver.send(Session2Command.RESULT_INFO_SKIPPED, null);

                } else {

                    resultReceiver.send(result.getResultCode(), result.getResultData());

                }
@@ -753,8 +753,8 @@ public class MediaSession2 implements AutoCloseable { 
         * @param controller controller information

         * @param command the session command

         * @param args optional arguments

         * @return the result for the session command. A runtime exception will be thrown if null

         *         is returned.

         * @return the result for the session command. If {@code null}, RESULT_INFO_SKIPPED

         *         will be sent to the session.

         */

        @Nullable

        public Session2Command.Result onSessionCommand(@NonNull MediaSession2 session,