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

Commit b6e6a578 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Enable media to perform its own hidden API processing" into sc-dev am: 13fce792

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15130054

Change-Id: I19cc6832ae76243821f0307d294f419f2cdd7e68
parents 9039c506 13fce792
Loading
Loading
Loading
Loading
+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

+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
+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;