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
This commit is contained in:
Jeff Tinker
2014-04-02 12:40:37 -07:00
parent b920034e3b
commit aaf4427950
3 changed files with 4 additions and 1 deletions

View File

@@ -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

View File

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

View File

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