Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev

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

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" />
 

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);