commit 43f65e0f60a552d867b6aace75aeee58c0e4f08d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 05:04:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 05:04:00 2020 +0000
tree ddd1542ab22ffc4bbde32c3b279260cd0bfedc89
parent 5039b6099ea82f158f1318fd2be3a141dd0bd54e
parent 119b9ea01dbe581a25f42d18057e2283046e7ff2

default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d

Change-Id: I3aa8e6635baf17b395bd54e03fb6e59160bc9c7f

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 8ddc380..2db3607 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -152,6 +152,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) {