| commit | b168a4267ba888ae2154e87b6710f4f9d37f51ae | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Mar 10 00:50:21 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 10 00:50:21 2021 +0000 |
| tree | f66f8c3b96e25c788265ffa3e8c1521d5f27a2c5 | |
| parent | 1cd18dadfe64b21368786987b241ced4c2529769 [diff] | |
| parent | 6ce16cba33086947504e19e58061b55627f1bb12 [diff] |
Merge "Remove lock on MediaCrypto's decrypt call" into sc-dev
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp index af17679..3257f71 100644 --- a/drm/libmediadrm/CryptoHal.cpp +++ b/drm/libmediadrm/CryptoHal.cpp
@@ -343,6 +343,7 @@ Return<void> hResult; + mLock.unlock(); if (mPluginV1_2 != NULL) { hResult = mPluginV1_2->decrypt_1_2(secure, toHidlArray16(keyId), toHidlArray16(iv), hMode, hPattern, hSubSamples, hSource, offset, hDestination,