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

Fix cast v2 authentication unit test

Browse Source 
Merge of https://widevine-internal-review.googlesource.com/#/c/10309 from the widevine cdm repo.

bug: 15341137

Change-Id: I188d7d7a3861dcbec1950dfbe8dd9504a60899bf
This commit is contained in:
Jeff Tinker
2014-05-30 08:19:12 -07:00
parent 52683d3e28
commit 2bab114f59
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,22 +2,22 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.castv2.test" package="com.android.castv2.test"
> >
<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-permission android:name="android.permission.ACCESS_DRM_CERTIFICATES" />
<uses-library android:name="com.android.mediadrm.signer"
android:required="true" />
<uses-sdk android:minSdkVersion="18"></uses-sdk> <uses-sdk android:minSdkVersion="18"></uses-sdk>
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar"> <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
<activity android:name="CastSignAPITest" <uses-library android:name="com.android.mediadrm.signer"
android:label="@string/app_name" android:required="true" />
android:screenOrientation="landscape"> <activity android:name="CastSignAPITest"
<intent-filter> android:label="@string/app_name"
<action android:name="android.intent.action.MAIN" /> android:screenOrientation="landscape">
<category android:name="android.intent.category.LAUNCHER" /> <intent-filter>
</intent-filter> <action android:name="android.intent.action.MAIN" />
</activity> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application> </application>
</manifest> </manifest>

4
libwvdrmengine/test/castv2/src/com/android/castv2/test/CertificateRequester.java
View File

@@ -28,7 +28,7 @@ public class CertificateRequester {
MediaDrmSigner.Certificate result = null; MediaDrmSigner.Certificate result = null;
MediaDrmSigner.CertificateRequest certificateRequest = MediaDrmSigner.CertificateRequest certificateRequest =
MediaDrmSigner.getCertificateRequest(drm, MediaDrmSigner.CERTIFICATE_TYPE_X509, MediaDrmSigner.getCertificateRequest(drm, MediaDrmSigner.CERTIFICATE_TYPE_X509,
"test-certificate"); "cast.google.com");
PostRequestTask postTask = new PostRequestTask(certificateRequest.getData()); PostRequestTask postTask = new PostRequestTask(certificateRequest.getData());
Log.i(TAG, "Requesting certificate from server '" + certificateRequest.getDefaultUrl() + "'"); Log.i(TAG, "Requesting certificate from server '" + certificateRequest.getDefaultUrl() + "'");
@@ -82,7 +82,7 @@ public class CertificateRequester {
private byte[] postRequest(String url, byte[] certificateRequest) { private byte[] postRequest(String url, byte[] certificateRequest) {
HttpClient httpclient = new DefaultHttpClient(); HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(url + "?signedRequest=" + new String(certificateRequest)); HttpPost httppost = new HttpPost(url + "&signedRequest=" + new String(certificateRequest));
Log.d(TAG, "PostRequest:" + httppost.getRequestLine()); Log.d(TAG, "PostRequest:" + httppost.getRequestLine());

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

@@ -75,7 +75,7 @@ public class ProvisionRequester {
private byte[] postRequest(String url, byte[] drmRequest) { private byte[] postRequest(String url, byte[] drmRequest) {
HttpClient httpclient = new DefaultHttpClient(); HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(url + "?signedRequest=" + new String(drmRequest)); HttpPost httppost = new HttpPost(url + "&signedRequest=" + new String(drmRequest));
Log.d(TAG, "PostRequest:" + httppost.getRequestLine()); Log.d(TAG, "PostRequest:" + httppost.getRequestLine());