From 10a55612d04af767bd359e0376536b4ebcd320e9 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 8 May 2013 17:40:29 -0700 Subject: [PATCH] MediaDrmAPI test: send signed provisioning request as query string bug: 8790775 Merge of https://widevine-internal-review.googlesource.com/#/c/5510/ from Widevine CDM repository Change-Id: I7d040fcebdea7f038352bd4216dcbaab4ff9401c --- .../src/com/widevine/test/ProvisionRequester.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java b/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java index cb2a69ef..5e46dc66 100644 --- a/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java +++ b/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java @@ -5,7 +5,6 @@ import android.media.DeniedByServerException; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.HttpClient; import org.apache.http.client.ClientProtocolException; -import org.apache.http.entity.ByteArrayEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; @@ -64,7 +63,9 @@ public class ProvisionRequester { protected Void doInBackground(String... urls) { mResponseBody = postRequest(urls[0], mDrmRequest); - Log.d(TAG, "response length=" + mResponseBody.length); + if (mResponseBody != null) { + Log.d(TAG, "response length=" + mResponseBody.length); + } return null; } @@ -73,14 +74,14 @@ public class ProvisionRequester { } private byte[] postRequest(String url, byte[] drmRequest) { - Log.d(TAG, "PostRequest url=" + url); 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 { // Add data - ByteArrayEntity entity = new ByteArrayEntity(drmRequest); - httppost.setEntity(entity); + httppost.setHeader("Accept", "*/*"); httppost.setHeader("User-Agent", "Widevine CDM v1.0"); httppost.setHeader("Content-Type", "application/json");