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 9d49232d82f78dd5b74a9e22d48b821396a943f2..d3330c553f52f92ffc70a150e1e52a89e87caded 100644 |
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
@@ -10,10 +10,10 @@ import android.media.MediaDrm; |
import android.os.AsyncTask; |
import android.os.Build; |
import android.os.Handler; |
-import android.util.Log; |
import org.chromium.base.CalledByNative; |
import org.chromium.base.JNINamespace; |
+import org.chromium.base.Log; |
import java.io.BufferedInputStream; |
import java.io.ByteArrayOutputStream; |
@@ -58,6 +58,7 @@ public class MediaDrmBridge { |
private static final String TAG = "MediaDrmBridge"; |
private static final String SECURITY_LEVEL = "securityLevel"; |
+ private static final String SERVER_CERTIFICATE = "serviceCertificate"; |
private static final String PRIVACY_MODE = "privacyMode"; |
private static final String SESSION_SHARING = "sessionSharing"; |
private static final String ENABLE = "enable"; |
@@ -343,6 +344,26 @@ public class MediaDrmBridge { |
} |
/** |
+ * Set the server certificate. |
+ * |
+ * @param certificate Server certificate to be set. |
+ * @return whether the server certificate was successfully set. |
+ */ |
+ @CalledByNative |
+ private boolean setServerCertificate(byte[] certificate) { |
+ try { |
+ mMediaDrm.setPropertyByteArray(SERVER_CERTIFICATE, certificate); |
+ return true; |
+ } catch (java.lang.IllegalArgumentException e) { |
+ Log.e(TAG, "Failed to set server certificate", e); |
+ } catch (java.lang.IllegalStateException e) { |
+ Log.e(TAG, "Failed to set server certificate", e); |
+ } |
+ |
+ return false; |
+ } |
+ |
+ /** |
* Return the MediaCrypto object if available. |
*/ |
@CalledByNative |