From aaf4427950616c5204c4bae64873e135702b5acb Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Wed, 2 Apr 2014 12:40:37 -0700
Subject: [PATCH] Add signature|system permission to MediaDrm signer APIs

Update test to require the system permission

Merge of https://widevine-internal-review.googlesource.com/#/c/9652
from the Widevine cdm repo.

Change-Id: I071e55f09f85c420e6778ebf170f5110cf39809e
related-to-bug: 12702350
---
 libwvdrmengine/test/castv2/Android.mk                           | 2 ++
 libwvdrmengine/test/castv2/AndroidManifest.xml                  | 1 +
 .../castv2/src/com/android/castv2/test/CastSignAPITest.java     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/test/castv2/Android.mk b/libwvdrmengine/test/castv2/Android.mk
index 4f9cf909..574e4d71 100644
--- a/libwvdrmengine/test/castv2/Android.mk
+++ b/libwvdrmengine/test/castv2/Android.mk
@@ -3,6 +3,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_CERTIFICATE := platform
+
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_JAVA_LIBRARIES := com.android.mediadrm.signer
diff --git a/libwvdrmengine/test/castv2/AndroidManifest.xml b/libwvdrmengine/test/castv2/AndroidManifest.xml
index 479293a1..acd97a52 100644
--- a/libwvdrmengine/test/castv2/AndroidManifest.xml
+++ b/libwvdrmengine/test/castv2/AndroidManifest.xml
@@ -4,6 +4,7 @@
 >
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_DRM_CERTIFICATES" />
     <uses-library android:name="com.android.mediadrm.signer"
                   android:required="true" />
 
diff --git a/libwvdrmengine/test/castv2/src/com/android/castv2/test/CastSignAPITest.java b/libwvdrmengine/test/castv2/src/com/android/castv2/test/CastSignAPITest.java
index 917df249..3a6f86e7 100644
--- a/libwvdrmengine/test/castv2/src/com/android/castv2/test/CastSignAPITest.java
+++ b/libwvdrmengine/test/castv2/src/com/android/castv2/test/CastSignAPITest.java
@@ -157,7 +157,7 @@ public class CastSignAPITest extends Activity {
         } else {
             byte[] sessionId = openSession(drm);
 
-            byte[] signature = MediaDrmSigner.signRSA(this, drm, sessionId, "PKCS1-BlockType1",
+            byte[] signature = MediaDrmSigner.signRSA(drm, sessionId, "PKCS1-BlockType1",
                                                       signerCert.getWrappedPrivateKey(),
                                                       kDigest);