Move MediaDrmBridge provision communication to native side.

media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

Index: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
index 95f67803d65f6567c55056fae001e6588ba21c66..80b4edfdbeeaa7498fa78c1a31c770c426ce7fcf 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -7,19 +7,12 @@ package org.chromium.media;
 import android.annotation.TargetApi;
 import android.media.MediaCrypto;
 import android.media.MediaDrm;
-import android.os.AsyncTask;
 import android.os.Build;
 
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;

[xhwang, 2015/11/02 20:37:05]

wow, so happy to see this change! Thanks!

 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -90,8 +83,6 @@ public class MediaDrmBridge {
     // The queue of all pending createSession() data.
     private ArrayDeque<PendingCreateSessionData> mPendingCreateSessionDataQueue;
 
-    private boolean mResetDeviceCredentialsPending;

[xhwang, 2015/11/02 20:37:05]

It's probably better to keep this logic in Java. See my comment below.

[Tima Vaisburd, 2015/11/05 02:24:07]

Done.

-
     // MediaDrmBridge is waiting for provisioning response from the server.
     //
     // Notes about NotProvisionedException: This exception can be thrown in a
@@ -209,7 +200,6 @@ public class MediaDrmBridge {
 
         mSessionIds = new HashMap<ByteBuffer, String>();
         mPendingCreateSessionDataQueue = new ArrayDeque<PendingCreateSessionData>();
-        mResetDeviceCredentialsPending = false;
         mProvisioningPending = false;
 
         mMediaDrm.setOnEventListener(new EventListener());
@@ -412,10 +402,11 @@ public class MediaDrmBridge {
      */
     @CalledByNative
     private void resetDeviceCredentials() {
-        mResetDeviceCredentialsPending = true;
         MediaDrm.ProvisionRequest request = mMediaDrm.getProvisionRequest();
-        PostRequestTask postTask = new PostRequestTask(request.getData());
-        postTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, request.getDefaultUrl());
+        if (isNativeMediaDrmBridgeValid()) {
+            nativeOnStartProvisioning(
+                    mNativeMediaDrmBridge, request.getDefaultUrl(), request.getData());
+        }
     }
 
     /**
@@ -527,6 +518,7 @@ public class MediaDrmBridge {
     /**
      * Process all pending createSession() calls synchronously.
      */
+    @CalledByNative
     private void processPendingCreateSessionData() {

[xhwang, 2015/11/02 20:37:05]

Why are you exposing this to the native code? Can't we call this in
provideProvisionResponse()?

In principle, I'd like to keep the JNI layer as simple as possible.

[Tima Vaisburd, 2015/11/05 02:24:07]

Done.

         Log.d(TAG, "processPendingCreateSessionData()");
         assert mMediaDrm != null;
@@ -745,43 +737,27 @@ public class MediaDrmBridge {
         assert !mProvisioningPending;
         mProvisioningPending = true;
         MediaDrm.ProvisionRequest request = mMediaDrm.getProvisionRequest();
-        PostRequestTask postTask = new PostRequestTask(request.getData());
-        postTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, request.getDefaultUrl());
+
+        if (isNativeMediaDrmBridgeValid()) {
+            nativeOnStartProvisioning(
+                    mNativeMediaDrmBridge, request.getDefaultUrl(), request.getData());
+        }
     }
 
     /**
-     * Called when the provision response is received.
+     * Provides the provision response to MediaDrm.
      *
-     * @param response Response data from the provision server.
+     * @returns false if the response is invalid or on error, true otherwise.
      */
-    private void onProvisionResponse(byte[] response) {
-        Log.d(TAG, "onProvisionResponse()");
-        assert mProvisioningPending;
+    @CalledByNative
+    boolean provideProvisionResponse(byte[] response) {
+        // We need to reset |mProvisioningPending| after receiving provisioning response.
         mProvisioningPending = false;
 
-        // If |mMediaDrm| is released, there is no need to callback native.
         if (mMediaDrm == null) {
-            return;
-        }
-
-        boolean success = provideProvisionResponse(response);
-
-        if (mResetDeviceCredentialsPending) {
-            onResetDeviceCredentialsCompleted(success);
-            mResetDeviceCredentialsPending = false;
-        }
-
-        if (success) {
-            processPendingCreateSessionData();
+            return false;
         }
-    }
 
-    /**
-     * Provide the provisioning response to MediaDrm.
-     *
-     * @returns false if the response is invalid or on error, true otherwise.
-     */
-    boolean provideProvisionResponse(byte[] response) {
         if (response == null || response.length == 0) {
             Log.e(TAG, "Invalid provision response.");
             return false;
@@ -966,81 +942,13 @@ public class MediaDrmBridge {
         }
     }
 
-    private class PostRequestTask extends AsyncTask<String, Void, Void> {
-        private static final String TAG = "PostRequestTask";
-
-        private byte[] mDrmRequest;
-        private byte[] mResponseBody;
-
-        public PostRequestTask(byte[] drmRequest) {
-            mDrmRequest = drmRequest;
-        }
-
-        @Override
-        protected Void doInBackground(String... urls) {
-            mResponseBody = postRequest(urls[0], mDrmRequest);
-            if (mResponseBody != null) {
-                Log.d(TAG, "response length=%d", mResponseBody.length);
-            }
-            return null;
-        }
-
-        private byte[] postRequest(String url, byte[] drmRequest) {
-            HttpURLConnection urlConnection = null;
-            try {
-                URL request = new URL(url + "&signedRequest=" + new String(drmRequest));
-                urlConnection = (HttpURLConnection) request.openConnection();
-                urlConnection.setDoOutput(true);
-                urlConnection.setDoInput(true);
-                urlConnection.setUseCaches(false);
-                urlConnection.setRequestMethod("POST");
-                urlConnection.setRequestProperty("User-Agent", "Widevine CDM v1.0");
-                urlConnection.setRequestProperty("Content-Type", "application/json");
-
-                int responseCode = urlConnection.getResponseCode();
-                if (responseCode == 200) {
-                    BufferedInputStream bis =
-                            new BufferedInputStream(urlConnection.getInputStream());
-                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                    int read = 0;
-                    int bufferSize = 512;
-                    byte[] buffer = new byte[bufferSize];
-                    try {
-                        while (true) {
-                            read = bis.read(buffer);
-                            if (read == -1) break;
-                            bos.write(buffer, 0, read);
-                        }
-                    } finally {
-                        bis.close();
-                    }
-                    return bos.toByteArray();
-                } else {
-                    Log.d(TAG, "Server returned HTTP error code %d", responseCode);
-                    return null;
-                }
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } catch (IllegalStateException e) {
-                e.printStackTrace();
-            } finally {
-                if (urlConnection != null) urlConnection.disconnect();
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            onProvisionResponse(mResponseBody);
-        }
-    }
-
     // Native functions. At the native side, must post the task immediately to
     // avoid reentrancy issues.
     private native void nativeOnMediaCryptoReady(long nativeMediaDrmBridge);
 
+    private native void nativeOnStartProvisioning(
+            long nativeMediaDrmBridge, String defaultUrl, byte[] requestData);
+
     private native void nativeOnPromiseResolved(long nativeMediaDrmBridge, long promiseId);
     private native void nativeOnPromiseResolvedWithSession(
             long nativeMediaDrmBridge, long promiseId, byte[] sessionId);