diff options
| author | Robert Shih <robertshih@google.com> | 2019-03-08 21:59:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-08 21:59:23 +0000 |
| commit | c2b585d8714da3049568f3001409ee1bc2b1b8e2 (patch) | |
| tree | 4e9c6c51eb68276c408d57216611c6b0ccf6d080 | |
| parent | e361ec05a053860ce9ef0cd46f6aebc7e5bba549 (diff) | |
| parent | 23ecaaf5481fe75585db2452b710c010955a8e01 (diff) | |
| download | frameworks_av-c2b585d8714da3049568f3001409ee1bc2b1b8e2.tar.gz frameworks_av-c2b585d8714da3049568f3001409ee1bc2b1b8e2.tar.bz2 frameworks_av-c2b585d8714da3049568f3001409ee1bc2b1b8e2.zip | |
Merge "clearkey hidl: return ERROR_DRM_FRAME_TOO_LARGE when frame is too large"
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp index fc0cceb66e..23a35e5bdb 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp @@ -135,7 +135,7 @@ Return<void> CryptoPlugin::decrypt_1_2( } if (destBuffer.offset + destBuffer.size > destBase->getSize()) { - _hidl_cb(Status_V1_2::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size"); + _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size"); return Void(); } destPtr = static_cast<void *>(base + destination.nonsecureMemory.offset); |