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

Commit 6003d8f4 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Allow onSessionCommand return null 

Bug: 123206059
Test: atest -t CtsMediaTestCases:android.media.cts.MediaSession2Test
Change-Id: Iab51c2e618f67bf7cf6b17ae33b379c5c3a4b677
parent f1cef973

media/java/android/media/MediaController2.java

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,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());

                }
@@ -433,8 +433,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
@@ -373,7 +373,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());

                }
@@ -731,8 +731,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,