From f8bedc9affe387f447197b9724ef7714efd58c28 Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Thu, 10 Sep 2020 07:44:30 +0900 Subject: [PATCH] Make MediaSessionManager#RESULT_MEDIA_KEY_*HANDLED as @SystemApi Bug: 168143618 Test: m update-api -j; Change-Id: I1529d5dc2a3a38a0b300f0297c3e689311244f40 --- api/module-lib-current.txt | 2 ++ media/java/android/media/session/MediaSessionManager.java | 7 +++++-- non-updatable-api/module-lib-current.txt | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index c12d897b9d726..4f0e2cd3c768d 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -66,6 +66,8 @@ package android.media.session { method public boolean dispatchMediaKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent); method public void dispatchVolumeKeyEventAsSystemService(@NonNull android.view.KeyEvent, int); method public void dispatchVolumeKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent); + field public static final int RESULT_MEDIA_KEY_HANDLED = 1; // 0x1 + field public static final int RESULT_MEDIA_KEY_NOT_HANDLED = 0; // 0x0 } } diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 20006934ee46a..9494295e4bd9e 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -68,16 +68,19 @@ public final class MediaSessionManager { private static final String TAG = "SessionManager"; /** - * Used by IOnMediaKeyListener to indicate that the media key event isn't handled. + * Used to indicate that the media key event isn't handled. * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final int RESULT_MEDIA_KEY_NOT_HANDLED = 0; /** - * Used by IOnMediaKeyListener to indicate that the media key event is handled. + * Used to indicate that the media key event is handled. * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final int RESULT_MEDIA_KEY_HANDLED = 1; + private final ISessionManager mService; private final OnMediaKeyEventDispatchedListenerStub mOnMediaKeyEventDispatchedListenerStub = new OnMediaKeyEventDispatchedListenerStub(); diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index f7f42d0a59562..63b98cb5bd6a9 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -66,6 +66,8 @@ package android.media.session { method public boolean dispatchMediaKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent); method public void dispatchVolumeKeyEventAsSystemService(@NonNull android.view.KeyEvent, int); method public void dispatchVolumeKeyEventAsSystemService(@NonNull android.media.session.MediaSession.Token, @NonNull android.view.KeyEvent); + field public static final int RESULT_MEDIA_KEY_HANDLED = 1; // 0x1 + field public static final int RESULT_MEDIA_KEY_NOT_HANDLED = 0; // 0x0 } }