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

Commit d82ba315 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Update MediaDrm HALs' version property value to aidl" into tm-dev am: 7e15fbc9 

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

Change-Id: I1b336fe149041db7881db90134e9f027460245e4
parents f11da197 7e15fbc9

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");