Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 25ffb1959d52985456972ff9fa1131370cac9bb5..db02dc61589f813ff7787840c027d5ba73b89300 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -912,8 +912,7 @@ public class MediaDrmBridge {
: MediaDrm.KeyRequest.REQUEST_TYPE_RENEWAL;
}
- nativeOnSessionMessage(mNativeMediaDrmBridge, sessionId, requestType, request.getData(),
- request.getDefaultUrl());
+ nativeOnSessionMessage(mNativeMediaDrmBridge, sessionId, requestType, request.getData());
}
private void onSessionClosed(final byte[] sessionId) {
@@ -936,12 +935,6 @@ public class MediaDrmBridge {
}
}
- private void onLegacySessionError(final byte[] sessionId, final String errorMessage) {
- if (isNativeMediaDrmBridgeValid()) {
- nativeOnLegacySessionError(mNativeMediaDrmBridge, sessionId, errorMessage);
- }
- }
-
private void onResetDeviceCredentialsCompleted(final boolean success) {
if (isNativeMediaDrmBridgeValid()) {
nativeOnResetDeviceCredentialsCompleted(mNativeMediaDrmBridge, success);
@@ -979,8 +972,6 @@ public class MediaDrmBridge {
if (request != null) {
onSessionMessage(sessionId, request);
} else {
- onLegacySessionError(sessionId,
- "MediaDrm EVENT_KEY_REQUIRED: Failed to generate request.");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onSessionKeysChange(sessionId,
getDummyKeysInfo(MediaDrm.KeyStatus.STATUS_INTERNAL_ERROR)
@@ -993,7 +984,6 @@ public class MediaDrmBridge {
break;
case MediaDrm.EVENT_KEY_EXPIRED:
Log.d(TAG, "MediaDrm.EVENT_KEY_EXPIRED");
- onLegacySessionError(sessionId, "MediaDrm EVENT_KEY_EXPIRED.");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onSessionKeysChange(sessionId,
getDummyKeysInfo(MediaDrm.KeyStatus.STATUS_EXPIRED).toArray(),
@@ -1055,15 +1045,13 @@ public class MediaDrmBridge {
private native void nativeOnPromiseRejected(
long nativeMediaDrmBridge, long promiseId, String errorMessage);
- private native void nativeOnSessionMessage(long nativeMediaDrmBridge, byte[] sessionId,
- int requestType, byte[] message, String destinationUrl);
+ private native void nativeOnSessionMessage(
+ long nativeMediaDrmBridge, byte[] sessionId, int requestType, byte[] message);
private native void nativeOnSessionClosed(long nativeMediaDrmBridge, byte[] sessionId);
private native void nativeOnSessionKeysChange(long nativeMediaDrmBridge, byte[] sessionId,
Object[] keysInfo, boolean hasAdditionalUsableKey);
private native void nativeOnSessionExpirationUpdate(
long nativeMediaDrmBridge, byte[] sessionId, long expirationTime);
- private native void nativeOnLegacySessionError(
- long nativeMediaDrmBridge, byte[] sessionId, String errorMessage);
private native void nativeOnResetDeviceCredentialsCompleted(
long nativeMediaDrmBridge, boolean success);

Powered by Google App Engine
This is Rietveld 408576698