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

Commit 88dd29a6 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge changes Ie30f0ca8,I59b4d4ce 

* changes:
  Move Media 1.0 files in mainline back to framework
  Remove MediaSessionEngine.CallbackStub
parents c948e0a4 83ff14c3

Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ java_defaults { 
        "rs/java/**/*.java",



        ":framework-javastream-protos",

        // TODO: Resolve circular library dependency and remove media1-srcs

        ":media1-srcs",



        "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl",

        "core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl",
@@ -505,7 +503,11 @@ java_defaults { 
        "media/java/android/media/session/ICallback.aidl",

        "media/java/android/media/session/IOnMediaKeyListener.aidl",

        "media/java/android/media/session/IOnVolumeKeyLongPressListener.aidl",

        "media/java/android/media/session/ISession.aidl",

        "media/java/android/media/session/ISession2TokensListener.aidl",

        "media/java/android/media/session/ISessionCallback.aidl",

        "media/java/android/media/session/ISessionController.aidl",

        "media/java/android/media/session/ISessionControllerCallback.aidl",

        "media/java/android/media/session/ISessionManager.aidl",

        "media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl",

        "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl",
@@ -520,6 +522,8 @@ java_defaults { 
        "media/java/android/media/tv/ITvInputSessionCallback.aidl",

        "media/java/android/media/tv/ITvRemoteProvider.aidl",

        "media/java/android/media/tv/ITvRemoteServiceInput.aidl",

        "media/java/android/service/media/IMediaBrowserService.aidl",

        "media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",

        "telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl",

        "telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl",

        "telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl",

api/system-current.txt

+1 −28
Original line number Diff line number Diff line
@@ -3675,7 +3675,7 @@ package android.media.session { 
  }















  public final class MediaSessionEngine implements java.lang.AutoCloseable {













    ctor public MediaSessionEngine(@NonNull android.content.Context, @NonNull android.media.session.SessionLink, @NonNull android.media.session.SessionCallbackLink, @NonNull android.media.session.MediaSessionEngine.CallbackStub);













    ctor public MediaSessionEngine(@NonNull android.content.Context, @NonNull android.media.session.SessionLink, @NonNull android.media.session.SessionCallbackLink);















    method public void close();















    method public String getCallingPackage();















    method @NonNull public android.media.session.MediaController getController();









@@ -3700,33 +3700,6 @@ package android.media.session {













    method public void setSessionActivity(@Nullable android.app.PendingIntent);















  }



























  public static final class MediaSessionEngine.CallbackStub {













    ctor public MediaSessionEngine.CallbackStub();













    method public void onAdjustVolume(String, int, int, android.media.session.ControllerCallbackLink, int);













    method public void onCommand(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle, android.os.ResultReceiver);













    method public void onCustomAction(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle);













    method public void onFastForward(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onMediaButton(String, int, int, android.content.Intent, int, android.os.ResultReceiver);













    method public void onMediaButtonFromController(String, int, int, android.media.session.ControllerCallbackLink, android.content.Intent);













    method public void onNext(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onPause(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onPlay(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onPlayFromMediaId(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle);













    method public void onPlayFromSearch(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle);













    method public void onPlayFromUri(String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);













    method public void onPrepare(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onPrepareFromMediaId(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle);













    method public void onPrepareFromSearch(String, int, int, android.media.session.ControllerCallbackLink, String, android.os.Bundle);













    method public void onPrepareFromUri(String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);













    method public void onPrevious(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onRate(String, int, int, android.media.session.ControllerCallbackLink, android.media.Rating);













    method public void onRewind(String, int, int, android.media.session.ControllerCallbackLink);













    method public void onSeekTo(String, int, int, android.media.session.ControllerCallbackLink, long);













    method public void onSetVolumeTo(String, int, int, android.media.session.ControllerCallbackLink, int);













    method public void onSkipToTrack(String, int, int, android.media.session.ControllerCallbackLink, long);













    method public void onStop(String, int, int, android.media.session.ControllerCallbackLink);













  }



























  public static interface MediaSessionEngine.MediaButtonEventDelegate {















    method public boolean onMediaButtonIntent(android.content.Intent);















  }

































media/Android.bp



+0
−69




























Original line number
Diff line number
Diff line













java_library {













    name: "updatable-media1",



























    srcs: [













        ":media1-srcs",













        ":framework-media-annotation-srcs",













    ],



























    aidl: {













        export_include_dirs: [













            "apex/java",













        ],



























        // TODO: find out a way to include only the necessary aidl files instead of dirs.













        include_dirs: [













            "frameworks/base/core/java",













            "frameworks/base/media/java",













        ],













    },



























    installable: true,



























    // Make sure that the implementaion only relies on SDK or system APIs.













    sdk_version: "system_current",













}





























java_library {















    name: "updatable-media",


























@@ -57,54 +31,11 @@ java_library {













filegroup {















    name: "media-srcs-without-aidls",















    srcs : [













        ":media1-srcs-without-aidls",















        ":mediasession2-srcs-without-aidls",















        ":mediaplayer2-srcs",















    ],















}





























filegroup {













    name: "media1-srcs",













    srcs: [













        "apex/java/android/media/MediaDescription.java",













        "apex/java/android/media/MediaParceledListSlice.java",













        "apex/java/android/media/Rating.java",













        "apex/java/android/media/VolumeProvider.java",













        "apex/java/android/media/browse/MediaBrowser.java",













        "apex/java/android/media/browse/MediaBrowserUtils.java",













        "apex/java/android/media/session/ControllerCallbackLink.java",













        "apex/java/android/media/session/ControllerLink.java",













        "apex/java/android/media/session/ISession.aidl",













        "apex/java/android/media/session/ISessionCallback.aidl",













        "apex/java/android/media/session/ISessionController.aidl",













        "apex/java/android/media/session/ISessionControllerCallback.aidl",













        "apex/java/android/media/session/MediaController.java",













        "apex/java/android/media/session/MediaSessionEngine.java",













        "apex/java/android/media/session/MediaSessionProviderService.java",













        "apex/java/android/media/session/PlaybackState.java",













        "apex/java/android/media/session/SessionCallbackLink.java",













        "apex/java/android/media/session/SessionLink.java",













        "apex/java/android/service/media/IMediaBrowserService.aidl",













        "apex/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",













        "apex/java/android/service/media/MediaBrowserService.java",













    ],













}



























filegroup {













    name: "media1-srcs-without-aidls",













    srcs: [













        ":media1-srcs",













    ],













    exclude_srcs: [













        "apex/java/android/media/session/ISession.aidl",













        "apex/java/android/media/session/ISessionCallback.aidl",













        "apex/java/android/media/session/ISessionController.aidl",













        "apex/java/android/media/session/ISessionControllerCallback.aidl",













        "apex/java/android/service/media/IMediaBrowserService.aidl",













        "apex/java/android/service/media/IMediaBrowserServiceCallbacks.aidl",













    ],













}





























filegroup {















    name: "mediasession2-srcs",















    srcs: [