commit 86828796ac9ebfca8b0c80591f7d068ab9a48e42
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 03:59:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 03:59:10 2020 +0000
tree 28ff028f5f199c3aeb32b929dbc482b726f1aead
parent 756f134fcc9f88a5c65e5254f486c062c44b2f9a
parent d79abbb0d359dd037e6d0b4cc022fd26cea3ebaa

default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3

Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 6626c01..c9383ff 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -143,6 +143,7 @@
                 return Void();
             }
 
+            base = static_cast<uint8_t *>(static_cast<void *>(destBase->getPointer()));
             destPtr = static_cast<void *>(base + destination.nonsecureMemory.offset);
         } else if (destination.type == BufferType::NATIVE_HANDLE) {
             if (!secure) {