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

MediaDrmAPI test: send signed provisioning request as query string

Browse Source 
bug: 8790775

Merge of https://widevine-internal-review.googlesource.com/#/c/5510/
from Widevine CDM repository

Change-Id: I7d040fcebdea7f038352bd4216dcbaab4ff9401c
This commit is contained in:
Jeff Tinker
2013-05-08 17:40:29 -07:00
parent f62dc230bb
commit 10a55612d0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java
View File

@@ -5,7 +5,6 @@ import android.media.DeniedByServerException;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ClientProtocolException;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
@@ -64,7 +63,9 @@ public class ProvisionRequester {
protected Void doInBackground(String... urls) { protected Void doInBackground(String... urls) {
mResponseBody = postRequest(urls[0], mDrmRequest); mResponseBody = postRequest(urls[0], mDrmRequest);
Log.d(TAG, "response length=" + mResponseBody.length); if (mResponseBody != null) {
Log.d(TAG, "response length=" + mResponseBody.length);
}
return null; return null;
} }
@@ -73,14 +74,14 @@ public class ProvisionRequester {
} }
private byte[] postRequest(String url, byte[] drmRequest) { private byte[] postRequest(String url, byte[] drmRequest) {
Log.d(TAG, "PostRequest url=" + url);
HttpClient httpclient = new DefaultHttpClient(); HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(url); HttpPost httppost = new HttpPost(url + "&signedRequest=" + new String(drmRequest));
Log.d(TAG, "PostRequest:" + httppost.getRequestLine());
try { try {
// Add data // Add data
ByteArrayEntity entity = new ByteArrayEntity(drmRequest); httppost.setHeader("Accept", "*/*");
httppost.setEntity(entity);
httppost.setHeader("User-Agent", "Widevine CDM v1.0"); httppost.setHeader("User-Agent", "Widevine CDM v1.0");
httppost.setHeader("Content-Type", "application/json"); httppost.setHeader("Content-Type", "application/json");