loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for null listeners in deprecated paths in DefaultDrmSessionManager.

Browse Source 
The previous API allowed to pass in null to the constructors although variants
without listeners exist. That's why we need to handle these null values.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191577891
This commit is contained in:
tonihei 2018-04-04 05:05:47 -07:00 committed by Oliver Woodman
parent 631e1db7f9
commit 7c65b94578
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -121,7 +121,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
throws UnsupportedDrmException { throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager = DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newWidevineInstance(callback, optionalKeyRequestParameters); newWidevineInstance(callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener); drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager; return drmSessionManager;
} }
@ -152,7 +154,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
throws UnsupportedDrmException { throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager = DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newPlayReadyInstance(callback, customData); newPlayReadyInstance(callback, customData);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener); drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager; return drmSessionManager;
} }
@ -192,7 +196,9 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
throws UnsupportedDrmException { throws UnsupportedDrmException {
DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager = DefaultDrmSessionManager<FrameworkMediaCrypto> drmSessionManager =
newFrameworkInstance(uuid, callback, optionalKeyRequestParameters); newFrameworkInstance(uuid, callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
drmSessionManager.addListener(eventHandler, eventListener); drmSessionManager.addListener(eventHandler, eventListener);
}
return drmSessionManager; return drmSessionManager;
} }
@ -230,8 +236,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
Handler eventHandler, Handler eventHandler,
DefaultDrmSessionEventListener eventListener) { DefaultDrmSessionEventListener eventListener) {
this(uuid, mediaDrm, callback, optionalKeyRequestParameters); this(uuid, mediaDrm, callback, optionalKeyRequestParameters);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener); addListener(eventHandler, eventListener);
} }
}
/** /**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
@ -268,8 +276,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
DefaultDrmSessionEventListener eventListener, DefaultDrmSessionEventListener eventListener,
boolean multiSession) { boolean multiSession) {
this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession); this(uuid, mediaDrm, callback, optionalKeyRequestParameters, multiSession);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener); addListener(eventHandler, eventListener);
} }
}
/** /**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.
@ -316,8 +326,10 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
optionalKeyRequestParameters, optionalKeyRequestParameters,
multiSession, multiSession,
initialDrmRequestRetryCount); initialDrmRequestRetryCount);
if (eventHandler != null && eventListener != null) {
addListener(eventHandler, eventListener); addListener(eventHandler, eventListener);
} }
}
/** /**
* @param uuid The UUID of the drm scheme. * @param uuid The UUID of the drm scheme.