From 4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Fri, 6 Apr 2012 11:06:28 -0700
Subject: New API to support submitting encrypted buffers to the decoder.

Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873
related-to-bug: 6275919
---
 media/libmedia/ICrypto.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'media/libmedia/ICrypto.cpp')

diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 1fe6bed..e6bea1f 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -97,6 +97,17 @@ struct BpCrypto : public BpInterface<ICrypto> {
         data.writeInterfaceToken(ICrypto::getInterfaceDescriptor());
         data.writeInt32(secure);
         data.writeInt32(mode);
+
+        static const uint8_t kDummy[16] = { 0 };
+
+        if (key == NULL) {
+            key = kDummy;
+        }
+
+        if (iv == NULL) {
+            iv = kDummy;
+        }
+
         data.write(key, 16);
         data.write(iv, 16);
 
-- 
cgit v1.1