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

Commit d73c444e authored by Kyle Zhang's avatar Kyle Zhang Committed by Gerrit Code Review
Browse files

Merge "Fix log spam in DrmHalHidl"

parents 1a7ceedf 4a7dd2c0

drm/libmediadrm/DrmHalAidl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ DrmStatus DrmHalAidl::isCryptoSchemeSupported(const uint8_t uuid[16], const Stri 


DrmStatus DrmHalAidl::createPlugin(const uint8_t uuid[16], const String8& appPackageName) {

    Mutex::Autolock autoLock(mLock);



    if (mInitCheck == ERROR_UNSUPPORTED) return mInitCheck;

    Uuid uuidAidl = DrmUtils::toAidlUuid(uuid);

    std::string appPackageNameAidl = toStdString(appPackageName);

    std::shared_ptr<IDrmPluginAidl> pluginAidl;
@@ -1216,7 +1216,7 @@ void DrmHalAidl::cleanup() { 
    closeOpenSessions();



    Mutex::Autolock autoLock(mLock);

    reportFrameworkMetrics(reportPluginMetrics());

    if (mInitCheck == OK) reportFrameworkMetrics(reportPluginMetrics());



    setListener(NULL);

    mInitCheck = NO_INIT;

drm/libmediadrm/DrmHalHidl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ DrmStatus DrmHalHidl::isCryptoSchemeSupported(const uint8_t uuid[16], const Stri 
DrmStatus DrmHalHidl::createPlugin(const uint8_t uuid[16], const String8& appPackageName) {

    Mutex::Autolock autoLock(mLock);



    if (mInitCheck == ERROR_UNSUPPORTED) return mInitCheck;

    for (ssize_t i = mFactories.size() - 1; i >= 0; i--) {

        auto hResult = mFactories[i]->isCryptoSchemeSupported(uuid);

        if (hResult.isOk() && hResult) {