commit 4f6b158fec3f99ff4af773da04dd4f5c5fe5a6b9
author Ming Zhou <b42586@freescale.com> Wed Mar 15 16:22:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 16:22:58 2017 +0000
tree 84f2160da16e61aa076cc5b504ba79321ddb9b74
parent bf7c90ad0445740c77b2ee380f382d937bdd67a8
parent 5052e9cf9f8c5a62163e5dacb7999b2552873c74

Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function."
am: 5052e9cf9f

Change-Id: I4eaf334bd11e1b91d68d40c0958f14364ee9b471

media/libmedia/IHDCP.cpp

diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp
index 15ed579..a46017f 100644
--- a/media/libmedia/IHDCP.cpp
+++ b/media/libmedia/IHDCP.cpp
@@ -240,6 +240,8 @@
 
         case HDCP_ENCRYPT:
         {
+            CHECK_INTERFACE(IHDCP, data, reply);
+
             size_t size = data.readInt32();
             void *inData = NULL;
             // watch out for overflow
@@ -313,6 +315,8 @@
 
         case HDCP_DECRYPT:
         {
+            CHECK_INTERFACE(IHDCP, data, reply);
+
             size_t size = data.readInt32();
             size_t bufSize = 2 * size;