Skip to content

SDK / exoplayer

Go to a project
Commit 62f719f3 by aquilescanta Committed by Toni
Options

Remove some long-deprecated DefaultDrmSessionManager constructors 

PiperOrigin-RevId: 240742207
parent 0810fe91
Inline Side-by-side
Showing with 0 additions and 128 deletions
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
...@@ -47,10 +47,6 @@ import java.util.UUID; ...@@ -47,10 +47,6 @@ import java.util.UUID;
public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>, public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
ProvisioningManager<T> { ProvisioningManager<T> {
/** @deprecated Use {@link DefaultDrmSessionEventListener}. */
@Deprecated
public interface EventListener extends DefaultDrmSessionEventListener {}
/** /**
* Signals that the {@link DrmInitData} passed to {@link #acquireSession} does not contain does * Signals that the {@link DrmInitData} passed to {@link #acquireSession} does not contain does
* not contain scheme data for the required UUID. * not contain scheme data for the required UUID.
...@@ -111,25 +107,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -111,25 +107,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
/* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler; /* package */ volatile @Nullable MediaDrmHandler mediaDrmHandler;
/** /**
* @deprecated Use {@link #newWidevineInstance(MediaDrmCallback, HashMap)} and {@link
* #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
public static DefaultDrmSessionManager<FrameworkMediaCrypto> newWidevineInstance(
MediaDrmCallback callback,
@Nullable HashMap<String, String> optionalKeyRequestParameters,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener)
throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newWidevineInstance(callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager;
}
/**
* Instantiates a new instance using the Widevine scheme. * Instantiates a new instance using the Widevine scheme.
* *
* @param callback Performs key and provisioning requests. * @param callback Performs key and provisioning requests.
...@@ -144,25 +121,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -144,25 +121,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* @deprecated Use {@link #newPlayReadyInstance(MediaDrmCallback, String)} and {@link
* #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
public static DefaultDrmSessionManager<FrameworkMediaCrypto> newPlayReadyInstance(
MediaDrmCallback callback,
@Nullable String customData,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener)
throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newPlayReadyInstance(callback, customData);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager;
}
/**
* Instantiates a new instance using the PlayReady scheme. * Instantiates a new instance using the PlayReady scheme.
* *
* <p>Note that PlayReady is unsupported by most Android devices, with the exception of Android TV * <p>Note that PlayReady is unsupported by most Android devices, with the exception of Android TV
...@@ -185,26 +143,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -185,26 +143,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* @deprecated Use {@link #newFrameworkInstance(UUID, MediaDrmCallback, HashMap)} and {@link
* #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstance(
UUID uuid,
MediaDrmCallback callback,
@Nullable HashMap<String, String> optionalKeyRequestParameters,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener)
throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newFrameworkInstance(uuid, callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager;
}
/**
* Instantiates a new instance. * Instantiates a new instance.
* *
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
...@@ -228,25 +166,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -228,25 +166,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap)}
* and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
@SuppressWarnings("method.invocation.invalid")
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm<T> mediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> optionalKeyRequestParameters,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener) {
this(uuid, mediaDrm, callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener);
}
}
/**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager. * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests. * @param callback Performs key and provisioning requests.
...@@ -268,26 +187,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -268,26 +187,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
* boolean)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
@SuppressWarnings("method.invocation.invalid")
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm<T> mediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> optionalKeyRequestParameters,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener,
boolean multiSession) {
this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener);
}
}
/**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager. * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests. * @param callback Performs key and provisioning requests.
...@@ -312,33 +211,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -312,33 +211,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
} }
/** /**
* @deprecated Use {@link #DefaultDrmSessionManager(UUID, ExoMediaDrm, MediaDrmCallback, HashMap,
* boolean, int)} and {@link #addListener(Handler, DefaultDrmSessionEventListener)}.
*/
@Deprecated
@SuppressWarnings("method.invocation.invalid")
public DefaultDrmSessionManager(
UUID uuid,
ExoMediaDrm<T> mediaDrm,
MediaDrmCallback callback,
@Nullable HashMap<String, String> optionalKeyRequestParameters,
@Nullable Handler eventHandler,
@Nullable DefaultDrmSessionEventListener eventListener,
boolean multiSession,
int initialDrmRequestRetryCount) {
this(
uuid,
mediaDrm,
callback,
optionalKeyRequestParameters,
multiSession,
initialDrmRequestRetryCount);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener);
}
}
/**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
* @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager. * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
* @param callback Performs key and provisioning requests. * @param callback Performs key and provisioning requests.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment