commit cb57745c24c7b6b2b3b498cc585f25de7853aacf
author Robert Shih <robertshih@google.com> Sun Feb 14 07:42:59 2021 +0000
committer Robert Shih <robertshih@google.com> Fri Feb 19 12:50:16 2021 +0000
tree f0f0688a0788b06a6bba48d86449c783b6197c80
parent 5d9a9e0e62a71adce994c1be7f289c7cccff3061

CryptoHal: graceful plugin creation failure

Bug: 162255728
Change-Id: I36ad115c9a60da64c4a9d2bd31d7e5c4fe2ebd70
Test: build

drm/libmediadrm/CryptoHal.cpp

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 9d39f83..af17679 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -146,6 +146,9 @@
                 plugin = hPlugin;
             }
         );
+    if (!hResult.isOk()) {
+        mInitCheck = DEAD_OBJECT;
+    }
     return plugin;
 }
 
@@ -179,10 +182,8 @@
         }
     }
 
-    if (mPlugin == NULL) {
-        mInitCheck = ERROR_UNSUPPORTED;
-    } else {
-        mInitCheck = OK;
+    if (mInitCheck == NO_INIT) {
+        mInitCheck = mPlugin == NULL ? ERROR_UNSUPPORTED : OK;
     }
 
     return mInitCheck;