diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
index 375ffc2733..8e63fbfaae 100644
--- a/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
@@ -37,6 +37,6 @@ public interface DrmSessionManager<T extends ExoMediaCrypto> {
   /**
    * Releases a {@link DrmSession}.
    */
-  void releaseSession(DrmSession drmSession);
+  void releaseSession(DrmSession<T> drmSession);
 
 }
diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java
index 2882111ac9..f3c6595736 100644
--- a/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java
@@ -40,7 +40,7 @@ import java.util.UUID;
  * A {@link DrmSessionManager} that supports streaming playbacks using {@link MediaDrm}.
  */
 @TargetApi(18)
-public class StreamingDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager,
+public class StreamingDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
     DrmSession<T> {
 
   /**
@@ -268,7 +268,7 @@ public class StreamingDrmSessionManager<T extends ExoMediaCrypto> implements Drm
   }
 
   @Override
-  public void releaseSession(DrmSession session) {
+  public void releaseSession(DrmSession<T> session) {
     if (--openCount != 0) {
       return;
     }