commit 2ba29909861b3600881468bb5ae9b25f5f30a20e
author Robert Shih <robertshih@google.com> Tue Feb 23 12:32:00 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 23 12:32:00 2021 +0000
tree 06c9d7fef28b2e86d4a91c9edc86fe5d4f1c6d43
parent c8dba222e53c88d014f3e5e76a0e8e4912691d62
parent cb57745c24c7b6b2b3b498cc585f25de7853aacf

Merge "CryptoHal: graceful plugin creation failure" into sc-dev

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;