commit 5641aa251bf9a6e7b6bf8a73214f92e42c393a2f
author Edwin Wong <edwinwong@google.com> Tue Jan 30 17:52:21 2018 -0800
committer Edwin Wong <edwinwong@google.com> Tue Jan 30 18:28:52 2018 -0800
tree e467ad21039dfdd95c8b0e4513d35e18f1e14cd4
parent 9111804e9051b2888c66e26ee1a872bb3ef7a988

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

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index d7816d7..07cec01 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -472,7 +472,9 @@
     for (size_t i = 0; i < mFactories.size(); i++) {
         if (mFactories[i]->isCryptoSchemeSupported(uuid)) {
             mPlugin = makeDrmPlugin(mFactories[i], uuid, appPackageName);
-            mPluginV1_1 = drm::V1_1::IDrmPlugin::castFrom(mPlugin);
+            if (mPlugin != NULL) {
+                mPluginV1_1 = drm::V1_1::IDrmPlugin::castFrom(mPlugin);
+            }
         }
     }
 
@@ -504,6 +506,7 @@
         }
     }
     mPlugin.clear();
+    mPluginV1_1.clear();
     return OK;
 }