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

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

Snap for 8292183 from bc7238fe to tm-release 

Change-Id: Ibcecfac81c8e12b0ee42ccea4199bfc15bcd753c
parents a448fa6b bc7238fe

drm/libmediadrm/DrmUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ std::vector<std::shared_ptr<IDrmFactoryAidl>> makeDrmFactoriesAidl() { 
        [](const char* instance, void* context) {

            auto fullName = std::string(IDrmFactoryAidl::descriptor) + "/" + std::string(instance);

            auto factory = IDrmFactoryAidl::fromBinder(

                    ::ndk::SpAIBinder(AServiceManager_getService(fullName.c_str())));

                    ::ndk::SpAIBinder(AServiceManager_waitForService(fullName.c_str())));

            if (factory == nullptr) {

                ALOGE("not found IDrmFactory. Instance name:[%s]", fullName.c_str());

                return;

drm/mediadrm/plugins/clearkey/aidl/DrmPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ DrmPlugin::DrmPlugin(SessionLibrary* sessionLibrary) 
void DrmPlugin::initProperties() {

    mStringProperties.clear();

    mStringProperties[kVendorKey] = kAidlVendorValue;

    mStringProperties[kVersionKey] = kVersionValue;

    mStringProperties[kVersionKey] = kAidlVersionValue;

    mStringProperties[kPluginDescriptionKey] = kAidlPluginDescriptionValue;

    mStringProperties[kAlgorithmsKey] = kAidlAlgorithmsValue;

    mStringProperties[kListenerTestSupportKey] = kAidlListenerTestSupportValue;
@@ -380,7 +380,7 @@ void DrmPlugin::installSecureStop(const std::vector<uint8_t>& sessionId) { 
    } else if (name == kDrmErrorTestKey) {

        value = mStringProperties[kDrmErrorTestKey];

    } else if (name == kAidlVersionKey) {

        value = mStringProperties[kAidlVersionValue];

        value = mStringProperties[kAidlVersionKey];

    } else {

        ALOGE("App requested unknown string property %s", name.c_str());

        status = Status::ERROR_DRM_CANNOT_HANDLE;

drm/mediadrm/plugins/clearkey/aidl/include/AidlClearKeryProperties.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


namespace clearkeydrm {

static const std::string kAidlVendorValue("Google");

static const std::string kAidlVersionValue("1.0");

static const std::string kAidlVersionValue("aidl-1");

static const std::string kAidlPluginDescriptionValue("ClearKey CDM");

static const std::string kAidlAlgorithmsValue("");

static const std::string kAidlListenerTestSupportValue("true");

media/janitors/media_leads_OWNERS

0 → 100644
+9 −0
Original line number Diff line number Diff line 
# gerrit owner/approvers corresponding to the TLs within the media team

# loosely (as of 2022/3) fgoldfain@ and direct reports

arifdikici@google.com

elaurent@google.com

fgoldfain@google.com

lajos@google.com

nchalko@google.com

olly@google.com

robertshih@google.com

media/mediaserver/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ cc_binary { 


    shared_libs: [

        "android.hardware.media.omx@1.0",

        "libandroidicu",

        "libicu",

        "libfmq",

        "libbinder",

        "libhidlbase",