summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 04:33:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 04:33:04 +0000
commit0e8630788fc6195dd61a76160b06ba38649e026b (patch)
tree15cbe0077586f30bdc328eb6165db17936cae6fb
parent1acfd12deba981aaaf05a1e5c28bd691c7492aed (diff)
parent44fa9a5cf077df4dcdbd709f231d56e695366b54 (diff)
downloadandroid_hardware_interfaces-0e8630788fc6195dd61a76160b06ba38649e026b.tar.gz
android_hardware_interfaces-0e8630788fc6195dd61a76160b06ba38649e026b.tar.bz2
android_hardware_interfaces-0e8630788fc6195dd61a76160b06ba38649e026b.zip
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
-rw-r--r--drm/1.0/default/CryptoPlugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 4fe6c9b43..19666f53a 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -153,6 +153,7 @@ namespace implementation {
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) {