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

Commit 610e0670 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "media2-stub" 

* changes:
  Move Session2Token to media apex
  Add updatable_media_stubs to prevent private API use.
parents 3bed6481 e6e5f413

Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ java_defaults { 
    no_framework_libs: true,

    libs: [

        "ext",

        "updatable_media_stubs",

    ],



    jarjar_rules: "jarjar_rules_hidl.txt",
@@ -1296,7 +1297,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media-srcs-without-aidls",

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

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

    ],
@@ -1358,7 +1359,7 @@ stubs_defaults { 
        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":conscrypt_public_api_files",

        ":media-srcs-without-aidls",

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

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,

media/Android.bp

+45 −4
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ java_library { 
    name: "updatable-media",



    srcs: [

        ":mediaplayer2-srcs",

        ":mediasession2-srcs",

        ":updatable-media-srcs",

        ":framework-media-annotation-srcs",

    ],
@@ -12,8 +11,12 @@ java_library { 
            "apex/java",

        ],



        // It would be great if we don't need to add include_dirs for public

        // parcelable classes. Find a better way.

        include_dirs: [

            // For the usage of android.os.Bundle and android.os.ResultReceiver in aidl files

            // To refer:

            // android.os.Bundle

            // android.os.ResultReceiver

            "frameworks/base/core/java",

        ],

    },
@@ -29,7 +32,15 @@ java_library { 
}



filegroup {

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

    name: "updatable-media-srcs",

    srcs: [

        ":mediasession2-srcs",

        ":mediaplayer2-srcs",

    ],

}



filegroup {

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

    srcs : [

        ":mediasession2-srcs-without-aidls",

        ":mediaplayer2-srcs",
@@ -51,6 +62,7 @@ filegroup { 
        "apex/java/android/media/Session2Command.java",

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

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

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

    ],

}
@@ -84,3 +96,32 @@ filegroup { 
        "apex/java/android/media/BufferingParams.java",

    ],

}



metalava_updatable_media_args = " --error UnhiddenSystemApi " +

    "--hide RequiresPermission " +

    "--hide MissingPermission --hide BroadcastBehavior " +

    "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +

    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +

    "--hide HiddenTypedefConstant "



droidstubs {

    name: "updatable-media-stubs",

    srcs: [

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

        ":framework-media-annotation-srcs",

    ],

    args: metalava_updatable_media_args + " --show-annotation android.annotation.SystemApi " +

        " --show-annotation android.annotation.TestApi ",

    // Ideally, sdk_version here should be "current_system", but "current - 1" is used

    // to avoid dependency cycle with framework.

    sdk_version: "28",

}



java_library {

    name: "updatable_media_stubs",

    srcs: [":updatable-media-stubs"],

    // Ideally, sdk_version here should be "current_system", but "current - 1" is used

    // to avoid dependency cycle with framework.

    sdk_version: "28",

}