commit 5b8987e7de9d04b09153f329c680d2316cdb44ec
author Andreas Huber <andih@google.com> Thu Apr 19 12:52:20 2012 -0700
committer Andreas Huber <andih@google.com> Thu Apr 19 12:53:59 2012 -0700
tree 2b08e1f8abd0d4b869ce8923b1462530b916a7eb
parent fd9e14bc28f377065e43ec6833d754ca151b3941

Allow propagation of error information and description from the CryptoPlugin to

the higher layers.

Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330
related-to-bug: 6365261

media/libmediaplayerservice/Crypto.cpp

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 @@
         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 @@
     }
 
     return mPlugin->decrypt(
-            secure, key, iv, mode, srcPtr, subSamples, numSubSamples, dstPtr);
+            secure, key, iv, mode, srcPtr, subSamples, numSubSamples, dstPtr,
+            errorDetailMsg);
 }
 
 }  // namespace android

media/libmediaplayerservice/Crypto.h

diff --git a/media/libmediaplayerservice/Crypto.h b/media/libmediaplayerservice/Crypto.h
index 74de2b5..c5aa3c6 100644
--- a/media/libmediaplayerservice/Crypto.h
+++ b/media/libmediaplayerservice/Crypto.h
@@ -49,7 +49,8 @@
             CryptoPlugin::Mode mode,
             const void *srcPtr,
             const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,
-            void *dstPtr);
+            void *dstPtr,
+            AString *errorDetailMsg);
 
 private:
     mutable Mutex mLock;