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

Commit 9441144a authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Xin Li
Browse files

Merge ab/7633965 

Bug: 169893837
Merged-In: I183224a4acc59c40d511ee2eb37da05210851348
Change-Id: I2acef1b69def9c46cdf28ccafc16c52940ea36cf
parents 0d0a5832 7a29a3df

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line 
[Hook Scripts]

mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}



hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



[Builtin Hooks]

clang_format = true

apex/Android.bp

+29 −0
Original line number Diff line number Diff line
@@ -98,6 +98,35 @@ bootclasspath_fragment { 
    name: "com.android.media-bootclasspath-fragment",

    contents: ["updatable-media"],

    apex_available: ["com.android.media"],



    api: {

        stub_libs: [

            // Stubs for the APIs provided by updatable-media. This has to be

            // specified explicitly because updatable-media is not a

            // java_sdk_library.

            "framework-media",

        ],

    },



    // The bootclasspath_fragments that provide APIs on which this depends.

    fragments: [

        {

            apex: "com.android.art",

            module: "art-bootclasspath-fragment",

        },

    ],



    // Additional stubs libraries that this fragment's contents use which are

    // not provided by another bootclasspath_fragment.

    additional_stubs: [

        "android-non-updatable",

    ],



    // Additional hidden API flag files to override the defaults. This must only be

    // modified by the Soong or platform compat team.

    hidden_api: {

        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],

    },

}



// Encapsulate the contributions made by the com.android.media to the systemserverclasspath.

apex/hiddenapi/OWNERS

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# soong-team@ as the hiddenapi files are tightly coupled with Soong

file:platform/build/soong:/OWNERS



# compat-team@ for changes to hiddenapi files

file:tools/platform-compat:/OWNERS

apex/hiddenapi/hiddenapi-max-target-o-low-priority.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Landroid/media/MediaSession2$ControllerInfo;-><init>(Landroid/content/Context;IILjava/lang/String;Landroid/os/IInterface;)V

Landroid/media/MediaSession2$ControllerInfo;->getPackageName()Ljava/lang/String;

Landroid/media/MediaSession2$ControllerInfo;->getProvider()Landroid/media/update/MediaSession2Provider$ControllerInfoProvider;

Landroid/media/MediaSession2$ControllerInfo;->getUid()I

Landroid/media/MediaSession2$ControllerInfo;->isTrusted()Z

Landroid/media/MediaSession2$ControllerInfo;->mProvider:Landroid/media/update/MediaSession2Provider$ControllerInfoProvider;

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 309999910,

  "version": 319999900,

  "requireNativeLibs": [

    "libandroid.so",

    "libbinder_ndk.so",