commit 337b9155d8fa0b896d7041a02f6c1b3132cc33ba
author Kyle Zhang <kelzhan@google.com> Mon May 16 22:39:33 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Tue May 17 20:38:03 2022 +0000
tree cf9e8c3eea6a91497f7f7844e11debf93391cedd
parent 4408cbe061d0c8aef09947a1bd5d28c87f8ef5cf

Reset Init Check to NO_INIT after destroy in CryptoHal implementation

Bug: 230163440
Bug: 230716337
Bug: 228432745
Test: GtsMediaTestCases
Change-Id: I1c56408471f65effc9c075300cd49ee12f00dbec

drm/libmediadrm/CryptoHalAidl.cpp

diff --git a/drm/libmediadrm/CryptoHalAidl.cpp b/drm/libmediadrm/CryptoHalAidl.cpp
index bda664a..8b9d1de 100644
--- a/drm/libmediadrm/CryptoHalAidl.cpp
+++ b/drm/libmediadrm/CryptoHalAidl.cpp
@@ -219,6 +219,7 @@
     }
 
     mPlugin.reset();
+    mInitCheck = NO_INIT;
     return OK;
 }
 
@@ -372,6 +373,10 @@
 
     Mutex::Autolock autoLock(mLock);
 
+    if (mInitCheck != OK) {
+        return -1;
+    }
+
     int32_t seqNum = mHeapSeqNum++;
     uint32_t bufferId = static_cast<uint32_t>(seqNum);
     mHeapSizes.add(seqNum, heap->size());