diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java index 724a7d2c87..d8311f6701 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java @@ -34,17 +34,17 @@ public final class DummyExoMediaDrm implements ExoMediaDrm { } @Override - public void setOnEventListener(OnEventListener listener) { + public void setOnEventListener(@Nullable OnEventListener listener) { // Do nothing. } @Override - public void setOnKeyStatusChangeListener(OnKeyStatusChangeListener listener) { + public void setOnKeyStatusChangeListener(@Nullable OnKeyStatusChangeListener listener) { // Do nothing. } @Override - public void setOnExpirationUpdateListener(OnExpirationUpdateListener listener) { + public void setOnExpirationUpdateListener(@Nullable OnExpirationUpdateListener listener) { // Do nothing. } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java index c74d1a1ff5..8d10b80bf9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java @@ -225,13 +225,13 @@ public interface ExoMediaDrm { } /** @see MediaDrm#setOnEventListener(MediaDrm.OnEventListener) */ - void setOnEventListener(OnEventListener listener); + void setOnEventListener(@Nullable OnEventListener listener); /** @see MediaDrm#setOnKeyStatusChangeListener(MediaDrm.OnKeyStatusChangeListener, Handler) */ - void setOnKeyStatusChangeListener(OnKeyStatusChangeListener listener); + void setOnKeyStatusChangeListener(@Nullable OnKeyStatusChangeListener listener); /** @see MediaDrm#setOnExpirationUpdateListener(MediaDrm.OnExpirationUpdateListener, Handler) */ - void setOnExpirationUpdateListener(OnExpirationUpdateListener listener); + void setOnExpirationUpdateListener(@Nullable OnExpirationUpdateListener listener); /** @see MediaDrm#openSession() */ byte[] openSession() throws MediaDrmException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java index 93d863ab0f..91e36370d2 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java @@ -106,7 +106,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { } @Override - public void setOnEventListener(ExoMediaDrm.OnEventListener listener) { + public void setOnEventListener(@Nullable ExoMediaDrm.OnEventListener listener) { mediaDrm.setOnEventListener( listener == null ? null @@ -115,7 +115,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { } @Override - public void setOnKeyStatusChangeListener(ExoMediaDrm.OnKeyStatusChangeListener listener) { + public void setOnKeyStatusChangeListener( + @Nullable ExoMediaDrm.OnKeyStatusChangeListener listener) { if (Util.SDK_INT < 23) { throw new UnsupportedOperationException(); } @@ -135,7 +136,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { } @Override - public void setOnExpirationUpdateListener(OnExpirationUpdateListener listener) { + public void setOnExpirationUpdateListener(@Nullable OnExpirationUpdateListener listener) { if (Util.SDK_INT < 23) { throw new UnsupportedOperationException(); }