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

Commit 710c8e9d authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: get secure and non-secure codec policy from mediacodec... 

Merge "libstagefright: get secure and non-secure codec policy from mediacodec list global settings" into mnc-dev
parents 6a8995e0 3bb9e744

media/libstagefright/MediaCodecList.cpp

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ void MediaCodecList::parseTopLevelXMLFile(const char *codecs_xml, bool ignore_er 
                        String8(kPolicySupportsMultipleSecureCodecs),

                        String8(value.c_str())));

    }

    if (mGlobalSettings->findString(kPolicySupportsSecureWithNonSecureCodec, &value)) {

        policies.push_back(

                MediaResourcePolicy(

                        String8(kPolicySupportsSecureWithNonSecureCodec),

                        String8(value.c_str())));

    }

    if (policies.size() > 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder = sm->getService(String16("media.resource_manager"));