From 0852ebab418adcf4abc661d4b495c74c1069293c Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Mon, 3 Dec 2018 18:39:26 +0900 Subject: [PATCH] AML: Make MediaSessionManager.createSession() as @SystemApi Bug: 119749862 Test: make update-api Change-Id: Ic3df0c3312c789130624fc42efc77ea3e1e01ad0 --- api/system-current.txt | 1 + .../android/media/session/MediaSessionManager.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 6cfcad3c4b9f7..1d0209fd766fb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3011,6 +3011,7 @@ package android.media.audiopolicy { package android.media.session { public final class MediaSessionManager { + method public android.media.session.ISession createSession(android.media.session.MediaSession.CallbackStub, java.lang.String, int); method public void setOnMediaKeyListener(android.media.session.MediaSessionManager.OnMediaKeyListener, android.os.Handler); method public void setOnVolumeKeyLongPressListener(android.media.session.MediaSessionManager.OnVolumeKeyLongPressListener, android.os.Handler); } diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 8215779d2b13e..d91cf8732674a 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -96,9 +96,15 @@ public final class MediaSessionManager { * @return The binder object from the system * @hide */ + @SystemApi public @NonNull ISession createSession(@NonNull MediaSession.CallbackStub cbStub, - @NonNull String tag, int userId) throws RemoteException { - return mService.createSession(mContext.getPackageName(), cbStub, tag, userId); + @NonNull String tag, int userId) { + try { + return mService.createSession(mContext.getPackageName(), cbStub, tag, userId); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + return null; } /**