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

Commit 83ff14c3 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Move Media 1.0 files in mainline back to framework 

Test: make update-api -j; make -j;
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: Ie30f0ca86bd9303683bf6573f2f5858c6fb3206a
parent 2a5179df

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",

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: [