summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 04:51:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 04:51:59 +0000
commit119b9ea01dbe581a25f42d18057e2283046e7ff2 (patch)
treec24970b4cff70973575c3b600e7eec2ba4635e7c
parent26be76d5855428220f0251db9dd01ebfba043a6e (diff)
parent0e8630788fc6195dd61a76160b06ba38649e026b (diff)
downloadandroid_hardware_interfaces-119b9ea01dbe581a25f42d18057e2283046e7ff2.tar.gz
android_hardware_interfaces-119b9ea01dbe581a25f42d18057e2283046e7ff2.tar.bz2
android_hardware_interfaces-119b9ea01dbe581a25f42d18057e2283046e7ff2.zip
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
-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 8ddc38022..2db360765 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -152,6 +152,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) {