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

Commit 6f07361d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13235988 from 20071243 to 25Q2-release

Change-Id: I5f5f154802a16ab3bc9ef57837549ed7e358f9e3
parents c3da11e1 20071243
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -737,9 +737,10 @@ static void dumpCodecDetails(bool queryDecoders) {
                }

                printf("    owner: \"%s\"\n", info->getOwnerName());
                printf("    hal name: \"%s\"\n", info->getHalName());
                printf("    rank: %u\n", info->getRank());
            } else {
                printf("    aliases, attributes, owner, rank: see above\n");
                printf("    aliases, attributes, owner, hal name, rank: see above\n");
            }

            {
+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@
package: "android.media.swcodec.flags"
container: "com.android.media.swcodec"

flag {
  name: "apexcodecs_base"
  # ApexCodecs API is getting called early in the boot process, so we need to make
  # sure that the flag value is stable from the early boot stage.
  is_fixed_read_only: true
  namespace: "codec_fwk"
  description: "Feature flag for base implementation of apexcodecs"
  bug: "401332082"
}

flag {
  name: "apv_software_codec"
  is_exported: true
+10 −0
Original line number Diff line number Diff line
@@ -289,3 +289,13 @@ flag {
    bug: "296232417"
    is_fixed_read_only: true
}

flag {
    name: "register_volume_callback_api_hardening"
    namespace: "media_audio"
    description:
            "Add modify audio settings privilege permission to un/register volume group "
            "callback APIs"
    bug: "402502314"
    is_fixed_read_only: true
}
+5 −4
Original line number Diff line number Diff line
@@ -1043,11 +1043,12 @@ void CCodec::allocate(const sp<MediaCodecInfo> &codecInfo) {
        mCallback->onError(UNKNOWN_ERROR, ACTION_CODE_FATAL);
        return;
    }
    ALOGD("allocate(%s)", codecInfo->getCodecName());
    mClientListener.reset(new ClientListener(this));

    AString componentName = codecInfo->getCodecName();
    AString halName = codecInfo->getHalName();
    std::shared_ptr<Codec2Client> client;
    ALOGD("allocate(%s)", componentName.c_str());

    // set up preferred component store to access vendor store parameters
    client = Codec2Client::CreateFromService("default");
@@ -1059,12 +1060,12 @@ void CCodec::allocate(const sp<MediaCodecInfo> &codecInfo) {

    std::shared_ptr<Codec2Client::Component> comp;
    c2_status_t status = Codec2Client::CreateComponentByName(
            componentName.c_str(),
            halName.c_str(),
            mClientListener,
            &comp,
            &client);
    if (status != C2_OK) {
        ALOGE("Failed Create component: %s, error=%d", componentName.c_str(), status);
        ALOGE("Failed Create component: %s, error=%d", halName.c_str(), status);
        Mutexed<State>::Locked state(mState);
        state->set(RELEASED);
        state.unlock();
@@ -1072,7 +1073,7 @@ void CCodec::allocate(const sp<MediaCodecInfo> &codecInfo) {
        state.lock();
        return;
    }
    ALOGI("Created component [%s]", componentName.c_str());
    ALOGI("Created component [%s] for [%s]", halName.c_str(), componentName.c_str());
    mChannel->setComponent(comp);
    auto setAllocated = [this, comp, client] {
        Mutexed<State>::Locked state(mState);
+32 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ cc_library_headers {
        "audiopolicy-aidl-cpp",
        "av-types-aidl-cpp",
        "spatializer-aidl-cpp",
        "volumegroupcallback-aidl-cpp",
    ],
    export_static_lib_headers: [
        "audioflinger-aidl-cpp",
        "audiopolicy-aidl-cpp",
        "av-types-aidl-cpp",
        "spatializer-aidl-cpp",
        "volumegroupcallback-aidl-cpp",
    ],
    target: {
        darwin: {
@@ -151,6 +153,7 @@ cc_library {
        "libutils",
        "packagemanager_aidl-cpp",
        "spatializer-aidl-cpp",
        "volumegroupcallback-aidl-cpp",
    ],
    export_shared_lib_headers: [
        "audioflinger-aidl-cpp",
@@ -160,6 +163,7 @@ cc_library {
        "libmediametrics",
        "libmediautils",
        "spatializer-aidl-cpp",
        "volumegroupcallback-aidl-cpp",
    ],

    include_dirs: [
@@ -472,6 +476,7 @@ aidl_interface {
        "capture_state_listener-aidl",
        "framework-permission-aidl",
        "spatializer-aidl",
        "volumegroupcallback-aidl",
    ],

    double_loadable: true,
@@ -539,3 +544,30 @@ aidl_interface {
        },
    },
}

aidl_interface {
    name: "volumegroupcallback-aidl",
    unstable: true,
    host_supported: true,
    vendor_available: true,
    local_include_dir: "aidl",
    srcs: [
        "aidl/android/media/INativeAudioVolumeGroupCallback.aidl",
    ],
    double_loadable: true,
    defaults: [
        "latest_android_media_audio_common_types_import_interface",
    ],
    backend: {
        cpp: {
            min_sdk_version: "29",
            apex_available: [
                "//apex_available:platform",
                "com.android.media",
            ],
        },
        java: {
            sdk_version: "module_current",
        },
    },
}
Loading