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

Commit 5641aa25 authored by Edwin Wong's avatar Edwin Wong
Browse files

Reset drmPluginV1_1 when destroyPlugin is called. 

Also check for NULL mDrmPlugin before casting to V1_1.

Test: Play Movies and NetFlix

bug: 72687425
Change-Id: I47aa18730332a17860b7e27440d417ffd612810f
parent 9111804e

drm/libmediadrm/DrmHal.cpp

+4 −1
Original line number Diff line number Diff line
@@ -472,9 +472,11 @@ status_t DrmHal::createPlugin(const uint8_t uuid[16], 
    for (size_t i = 0; i < mFactories.size(); i++) {

        if (mFactories[i]->isCryptoSchemeSupported(uuid)) {

            mPlugin = makeDrmPlugin(mFactories[i], uuid, appPackageName);

            if (mPlugin != NULL) {

                mPluginV1_1 = drm::V1_1::IDrmPlugin::castFrom(mPlugin);

            }

        }

    }



    if (mPlugin == NULL) {

        mInitCheck = ERROR_UNSUPPORTED;
@@ -504,6 +506,7 @@ status_t DrmHal::destroyPlugin() { 
        }

    }

    mPlugin.clear();

    mPluginV1_1.clear();

    return OK;

}