diff options
| author | Andreas Huber <andih@google.com> | 2012-04-19 12:52:20 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-19 12:53:59 -0700 |
| commit | 5b8987e7de9d04b09153f329c680d2316cdb44ec (patch) | |
| tree | 2b08e1f8abd0d4b869ce8923b1462530b916a7eb /media/libmediaplayerservice/Crypto.cpp | |
| parent | fd9e14bc28f377065e43ec6833d754ca151b3941 (diff) | |
| download | frameworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.zip frameworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.tar.gz frameworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.tar.bz2 | |
Allow propagation of error information and description from the CryptoPlugin to
the higher layers.
Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330
related-to-bug: 6365261
Diffstat (limited to 'media/libmediaplayerservice/Crypto.cpp')
| -rw-r--r-- | media/libmediaplayerservice/Crypto.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Crypto.cpp b/media/libmediaplayerservice/Crypto.cpp index 574ae71..d35d5b1 100644 --- a/media/libmediaplayerservice/Crypto.cpp +++ b/media/libmediaplayerservice/Crypto.cpp @@ -22,6 +22,7 @@ #include <media/hardware/CryptoAPI.h> #include <media/stagefright/foundation/ADebug.h> +#include <media/stagefright/foundation/AString.h> #include <media/stagefright/foundation/hexdump.h> #include <media/stagefright/MediaErrors.h> @@ -147,7 +148,8 @@ status_t Crypto::decrypt( CryptoPlugin::Mode mode, const void *srcPtr, const CryptoPlugin::SubSample *subSamples, size_t numSubSamples, - void *dstPtr) { + void *dstPtr, + AString *errorDetailMsg) { Mutex::Autolock autoLock(mLock); if (mInitCheck != OK) { @@ -159,7 +161,8 @@ status_t Crypto::decrypt( } return mPlugin->decrypt( - secure, key, iv, mode, srcPtr, subSamples, numSubSamples, dstPtr); + secure, key, iv, mode, srcPtr, subSamples, numSubSamples, dstPtr, + errorDetailMsg); } } // namespace android |