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

Commit bb3b401d authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Add build rule for updatable media 1.0 APIs

Bug: 119539849, Bug: 119539141
Test: build and boot,
    atest CtsMediaTestCases:android.media.cts.MediaSessionTest,
    atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Iaf07842de5aa00da5987b993b77960efa9a602bf
parent f86a56c5
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ java_defaults {


        ":framework-javastream-protos",
        ":framework-javastream-protos",
        // TODO: Remove this after introduce corresponding srcs under media/java/
        // TODO: Remove this after introduce corresponding srcs under media/java/
        ":media1-srcs",
        ":mediasession2-srcs",
        ":mediasession2-srcs",


        "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl",
        "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl",
@@ -503,11 +504,7 @@ java_defaults {
        "media/java/android/media/session/ICallback.aidl",
        "media/java/android/media/session/ICallback.aidl",
        "media/java/android/media/session/IOnMediaKeyListener.aidl",
        "media/java/android/media/session/IOnMediaKeyListener.aidl",
        "media/java/android/media/session/IOnVolumeKeyLongPressListener.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/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/session/ISessionManager.aidl",
        "media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl",
        "media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl",
        "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl",
        "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl",
@@ -1271,6 +1268,7 @@ stubs_defaults {
        ":non_openjdk_javadoc_files",
        ":non_openjdk_javadoc_files",
        ":android_icu4j_src_files_for_docs",
        ":android_icu4j_src_files_for_docs",
        ":conscrypt_public_api_files",
        ":conscrypt_public_api_files",
        ":media1-stubs-srcs",
        ":mediasession2-stubs-srcs",
        ":mediasession2-stubs-srcs",
        ":mediaplayer2-srcs",
        ":mediaplayer2-srcs",
        "test-mock/src/**/*.java",
        "test-mock/src/**/*.java",
@@ -1334,6 +1332,7 @@ stubs_defaults {
        ":non_openjdk_javadoc_files",
        ":non_openjdk_javadoc_files",
        ":android_icu4j_src_files_for_docs",
        ":android_icu4j_src_files_for_docs",
        ":conscrypt_public_api_files",
        ":conscrypt_public_api_files",
        ":media1-stubs-srcs",
        ":mediasession2-stubs-srcs",
        ":mediasession2-stubs-srcs",
        ":mediaplayer2-srcs",
        ":mediaplayer2-srcs",
    ],
    ],
@@ -1790,6 +1789,7 @@ filegroup {
        "core/java/android/annotation/RequiresPermission.java",
        "core/java/android/annotation/RequiresPermission.java",
        "core/java/android/annotation/SdkConstant.java",
        "core/java/android/annotation/SdkConstant.java",
        "core/java/android/annotation/StringDef.java",
        "core/java/android/annotation/StringDef.java",
        "core/java/android/annotation/SystemApi.java",
        "core/java/android/annotation/TestApi.java",
        "core/java/android/annotation/TestApi.java",
        "core/java/android/annotation/UnsupportedAppUsage.java",
        "core/java/android/annotation/UnsupportedAppUsage.java",
        "core/java/com/android/internal/annotations/GuardedBy.java",
        "core/java/com/android/internal/annotations/GuardedBy.java",
+50 −31
Original line number Original line Diff line number Diff line
java_library {
java_library {
    name: "media1",
    name: "updatable-media",


    srcs: [
    srcs: [
        ":media1-srcs",
        ":media1-srcs",
        ":mediasession2-srcs",
        ":mediaplayer2-srcs",
        ":framework-media-annotation-srcs",
    ],

    static_libs: [
        "mediaplayer2-protos",
    ],
    ],


    aidl: {
        export_include_dirs: [
            "apex/java",
        ],

        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",
    sdk_version: "system_current",
}
}


filegroup {
filegroup {
    name: "media1-srcs",
    name: "media1-srcs",
    srcs: [
    srcs: [
        "java/android/media/session/MediaSessionProviderService.java",
        "apex/java/android/media/MediaMetadata.java",
        "apex/java/android/media/MediaParceledListSlice.java",
        "apex/java/android/media/VolumeProvider.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",
    ],
}

filegroup {
    name: "media1-stubs-srcs",
    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",
    ],
    ],
}
}


@@ -46,35 +94,6 @@ filegroup {
    ],
    ],
}
}


java_library {
    name: "updatable-media",

    srcs: [
        ":mediasession2-srcs",
        ":mediaplayer2-srcs",
        ":framework-media-annotation-srcs",
    ],

    static_libs: [
        "mediaplayer2-protos",
    ],

    aidl: {
        export_include_dirs: [
            "apex/java",
        ],

        include_dirs: [
            "frameworks/base/core/java",
        ],
    },

    installable: true,

    // Make sure that the implementaion only relies on SDK or system APIs.
    sdk_version: "system_current",
}

filegroup {
filegroup {
    name: "mediaplayer2-srcs",
    name: "mediaplayer2-srcs",
    srcs: [
    srcs: [
+10 −10
Original line number Original line Diff line number Diff line
@@ -250,16 +250,16 @@ public final class MediaMetadata implements Parcelable {
     * second line for media described by this metadata this should be preferred
     * second line for media described by this metadata this should be preferred
     * to other fields if present.
     * to other fields if present.
     */
     */
    public static final String METADATA_KEY_DISPLAY_SUBTITLE
    public static final String METADATA_KEY_DISPLAY_SUBTITLE =
            = "android.media.metadata.DISPLAY_SUBTITLE";
            "android.media.metadata.DISPLAY_SUBTITLE";


    /**
    /**
     * A description that is suitable for display to the user. When displaying
     * A description that is suitable for display to the user. When displaying
     * more information for media described by this metadata this should be
     * more information for media described by this metadata this should be
     * preferred to other fields if present.
     * preferred to other fields if present.
     */
     */
    public static final String METADATA_KEY_DISPLAY_DESCRIPTION
    public static final String METADATA_KEY_DISPLAY_DESCRIPTION =
            = "android.media.metadata.DISPLAY_DESCRIPTION";
            "android.media.metadata.DISPLAY_DESCRIPTION";


    /**
    /**
     * An icon or thumbnail that is suitable for display to the user. When
     * An icon or thumbnail that is suitable for display to the user. When
@@ -270,8 +270,8 @@ public final class MediaMetadata implements Parcelable {
     * if it is too large. For higher resolution artwork
     * if it is too large. For higher resolution artwork
     * {@link #METADATA_KEY_DISPLAY_ICON_URI} should be used instead.
     * {@link #METADATA_KEY_DISPLAY_ICON_URI} should be used instead.
     */
     */
    public static final String METADATA_KEY_DISPLAY_ICON
    public static final String METADATA_KEY_DISPLAY_ICON =
            = "android.media.metadata.DISPLAY_ICON";
            "android.media.metadata.DISPLAY_ICON";


    /**
    /**
     * A Uri formatted String for an icon or thumbnail that is suitable for
     * A Uri formatted String for an icon or thumbnail that is suitable for
@@ -285,8 +285,8 @@ public final class MediaMetadata implements Parcelable {
     * {@link ContentResolver#EXTRA_SIZE} for retrieving scaled artwork through
     * {@link ContentResolver#EXTRA_SIZE} for retrieving scaled artwork through
     * {@link ContentResolver#openTypedAssetFileDescriptor(Uri, String, Bundle)}.
     * {@link ContentResolver#openTypedAssetFileDescriptor(Uri, String, Bundle)}.
     */
     */
    public static final String METADATA_KEY_DISPLAY_ICON_URI
    public static final String METADATA_KEY_DISPLAY_ICON_URI =
            = "android.media.metadata.DISPLAY_ICON_URI";
            "android.media.metadata.DISPLAY_ICON_URI";


    /**
    /**
     * A String key for identifying the content. This value is specific to the
     * A String key for identifying the content. This value is specific to the
@@ -320,8 +320,8 @@ public final class MediaMetadata implements Parcelable {
     * <li>{@link MediaDescription#BT_FOLDER_TYPE_YEARS}</li>
     * <li>{@link MediaDescription#BT_FOLDER_TYPE_YEARS}</li>
     * </ul>
     * </ul>
     */
     */
    public static final String METADATA_KEY_BT_FOLDER_TYPE
    public static final String METADATA_KEY_BT_FOLDER_TYPE =
            = "android.media.metadata.BT_FOLDER_TYPE";
            "android.media.metadata.BT_FOLDER_TYPE";


    private static final @TextKey String[] PREFERRED_DESCRIPTION_ORDER = {
    private static final @TextKey String[] PREFERRED_DESCRIPTION_ORDER = {
            METADATA_KEY_TITLE,
            METADATA_KEY_TITLE,
Loading