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

Commit 0f0a7a0e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12354992 from 0eed1580 to 24Q4-release 

Change-Id: Ia68db570534484fd59d50c6e189538825a6e4dff
parents 482da138 0eed1580

camera/camera_platform.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -122,16 +122,6 @@ flag { 
    bug: "316375635"

}



flag {

    namespace: "camera_platform"

    name: "single_thread_executor"

    description: "Ensure device logic is run within one thread."

    bug: "305857746"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "camera_platform"

    name: "single_thread_executor_naming"

drm/mediadrm/plugins/clearkey/aidl/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ cc_binary { 
    ],

    srcs: ["Service.cpp"],

    init_rc: ["android.hardware.drm-service.clearkey.rc"],

    vintf_fragments: ["android.hardware.drm-service.clearkey.xml"],

    vintf_fragment_modules: ["android.hardware.drm-service.clearkey.xml_vintf"],

}



cc_binary {
@@ -98,7 +98,13 @@ cc_binary { 
    overrides: ["android.hardware.drm-service.clearkey"],

    srcs: ["ServiceLazy.cpp"],

    init_rc: ["android.hardware.drm-service-lazy.clearkey.rc"],

    vintf_fragments: ["android.hardware.drm-service.clearkey.xml"],

    vintf_fragment_modules: ["android.hardware.drm-service.clearkey.xml_vintf"],

}



vintf_fragment {

    name: "android.hardware.drm-service.clearkey.xml_vintf",

    src: "android.hardware.drm-service.clearkey.xml",

    vendor: true,

}



cc_binary {

media/codec2/hal/aidl/ComponentStore.cpp

+8 −3
Original line number Diff line number Diff line
@@ -153,6 +153,13 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store) 
        mParamReflectors.push_back(paramReflector);

    }

#endif

    // MultiAccessUnit reflector helper is allocated once per store.

    // All components in this store can reuse this reflector helper.

    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {

        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();

        mParamReflectors.push_back(helper);

        mMultiAccessUnitReflector = helper;

    }



    // Retrieve supported parameters from store

    using namespace std::placeholders;
@@ -240,11 +247,9 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn 
                // param reflectors. Currently filters work on video domain only,

                // and the MultiAccessUnitHelper is only enabled on audio domain;

                // thus we pass the component's param reflector, which is mParamReflectors[0].

                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());

                multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(

                        c2interface,

                        multiAccessReflector);

                mParamReflectors.push_back(multiAccessReflector);

                        mMultiAccessUnitReflector);

            }

        }

    }

media/codec2/hal/aidl/include/codec2/aidl/ComponentStore.h

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ protected: 
    std::shared_ptr<C2ComponentStore> mStore;

    std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;



    // Reflector helper for MultiAccessUnitHelper

    std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;



    std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;

    std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;

    std::set<C2String> mLoadedInterfaces;

media/codec2/hal/hidl/1.0/utils/ComponentStore.cpp

+9 −4
Original line number Diff line number Diff line
@@ -149,6 +149,14 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store) 
    }

#endif



    // MultiAccessUnit reflector helper is allocated once per store.

    // All components in this store can reuse this reflector helper.

    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {

        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();

        mParamReflectors.push_back(helper);

        mMultiAccessUnitReflector = helper;

    }



    // Retrieve supported parameters from store

    using namespace std::placeholders;

    mInit = mConfigurable->init(mParameterCache);
@@ -231,12 +239,9 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn 
                }

            }

            if (!isComponentSupportsLargeAudioFrame) {

                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());

                multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(

                        c2interface,

                        multiAccessReflector);

                mParamReflectors.push_back(multiAccessReflector);



                        mMultiAccessUnitReflector);

            }

        }

    }