diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-03-02 20:49:19 -0700 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-03-02 20:49:19 -0700 |
| commit | 8ef820175e409d20c7d43b24aeb6bbf654559ce3 (patch) | |
| tree | 8c1fb4d789ada13f3ad0b909a8d0f3bbfe918a88 | |
| parent | 3002729ea5f0416823146711a679528e8f4088c9 (diff) | |
| parent | 706a84a7a7d9c5dcd2b651f608c14143e191aaef (diff) | |
| download | android_hardware_interfaces-lineage-15.1.tar.gz android_hardware_interfaces-lineage-15.1.tar.bz2 android_hardware_interfaces-lineage-15.1.zip | |
Merge tag 'android-8.1.0_r74' into staging/lineage-15.1_merge-android-8.1.0_r74lineage-15.1
Android 8.1.0 release 74
* tag 'android-8.1.0_r74':
default drm hidl: Fix decrypt destination base ptr
Change-Id: I019e31fe540d2853f054d0d8aa19640785ecfec2
| -rw-r--r-- | drm/1.0/default/CryptoPlugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp index aa5c6edc6..b86260342 100644 --- a/drm/1.0/default/CryptoPlugin.cpp +++ b/drm/1.0/default/CryptoPlugin.cpp @@ -156,6 +156,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) { |