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

Commit 7aa28d8f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make MediaSessionManager#RESULT_MEDIA_KEY_*HANDLED as @SystemApi"

parents afd954f3 f8bedc9a

api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

  }



}

media/java/android/media/session/MediaSessionManager.java

+5 −2
Original line number Diff line number Diff line
@@ -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();

non-updatable-api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

  }



}