commit d1c6a2775a7bd07cc7a715556fa629217c86ffea
author Sungsoo Lim <sungsoo@google.com> Tue Jan 22 15:38:29 2019 +0900
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 23 20:48:15 2019 +0000
tree 8001fa4934fe1eab120a4032d5571bd6aed16140
parent 5a8ef8426b4df8d20e3cfa614c06dcb78530869f

Allow onSessionCommand return null

Bug: 123206059
Test: atest -t CtsMediaTestCases:android.media.cts.MediaSession2Test
Change-Id: Iab51c2e618f67bf7cf6b17ae33b379c5c3a4b677
(cherry picked from commit 6003d8f4f653d9edecece1278bb2a87c4a336815)

media/java/android/media/MediaController2.java

diff --git a/media/java/android/media/MediaController2.java b/media/java/android/media/MediaController2.java
index dd97195..28e6637 100644
--- a/media/java/android/media/MediaController2.java
+++ b/media/java/android/media/MediaController2.java
@@ -316,7 +316,7 @@
                     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 @@
          * @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

diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java
index 3adac72..4ec25ce 100644
--- a/media/java/android/media/MediaSession2.java
+++ b/media/java/android/media/MediaSession2.java
@@ -373,7 +373,7 @@
                     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 @@
          * @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,