widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Tinker
2014-04-03 01:30:43 +00:00
committed by Android (Google) Code Review
parent 7eea20df86 aaf4427950
commit f9b1a2e1f1
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/test/castv2/Android.mk
View File

@@ -3,6 +3,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CERTIFICATE := platform
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := com.android.mediadrm.signer LOCAL_STATIC_JAVA_LIBRARIES := com.android.mediadrm.signer

1
libwvdrmengine/test/castv2/AndroidManifest.xml
View File

@@ -4,6 +4,7 @@
> >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <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" <uses-library android:name="com.android.mediadrm.signer"
android:required="true" /> android:required="true" />

2
libwvdrmengine/test/castv2/src/com/android/castv2/test/CastSignAPITest.java
View File

@@ -157,7 +157,7 @@ public class CastSignAPITest extends Activity {
} else { } else {
byte[] sessionId = openSession(drm); byte[] sessionId = openSession(drm);
byte[] signature = MediaDrmSigner.signRSA(this, drm, sessionId, "PKCS1-BlockType1", byte[] signature = MediaDrmSigner.signRSA(drm, sessionId, "PKCS1-BlockType1",
signerCert.getWrappedPrivateKey(), signerCert.getWrappedPrivateKey(),
kDigest); kDigest);