From ca2a37e7d852a2170a3dddef4bb3cc5b63be5a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= <ivanbuper@google.com>
Date: Fri, 23 Jun 2023 14:42:07 +0000
Subject: [PATCH] Rethrow setMediaButtonBroadcastReceiver exceptions

setMediaButtonBroadcastReceiver signals invalid arguments with
exceptions, so remote exceptions are valid and should be rethrown from
system server.

Test: atest CtsMediaBetterTogetherTestCases
Bug: 205124386
Change-Id: I6cb66d8336735f9c32d30d7d49ff28a2797bec60
---
 media/java/android/media/session/MediaSession.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 29e8716f08ac4..af33149867bda 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -315,7 +315,7 @@ public final class MediaSession {
             }
             mBinder.setMediaButtonBroadcastReceiver(broadcastReceiver);
         } catch (RemoteException e) {
-            Log.wtf(TAG, "Failure in setMediaButtonBroadcastReceiver.", e);
+            e.rethrowFromSystemServer();
         }
     }