commit 44fa9a5cf077df4dcdbd709f231d56e695366b54
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 04:14:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 04:14:08 2020 +0000
tree dab7291abb03843d37cc33a525a20cd76cb36309
parent f6e7c9ed25df49bfd0c9f6f9ebf40154ebff5cda
parent 86828796ac9ebfca8b0c80591f7d068ab9a48e42

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

Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index aa5c6ed..b862603 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -156,6 +156,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) {