From dce74f42090642fb0a0dc0edbfd755b3a5813dfe Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 28 Sep 2015 20:24:46 +0100
Subject: [PATCH] Add onDrmKeysLoaded back again (oops)

---
 .../android/exoplayer/demo/player/DemoPlayer.java   |  5 +++++
 .../exoplayer/drm/StreamingDrmSessionManager.java   | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java b/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
index 732c64dac6..982ef6c790 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java
@@ -448,6 +448,11 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi
     }
   }
 
+  @Override
+  public void onDrmKeysLoaded() {
+    // Do nothing.
+  }
+
   @Override
   public void onDrmSessionManagerError(Exception e) {
     if (internalErrorListener != null) {
diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
index 7df46e0f31..6e42cea28d 100644
--- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java
@@ -50,6 +50,11 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
    */
   public interface EventListener {
 
+    /**
+     * Invoked each time keys are loaded.
+     */
+    void onDrmKeysLoaded();
+
     /**
      * Invoked when a drm error occurs.
      *
@@ -386,6 +391,14 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
     try {
       mediaDrm.provideKeyResponse(sessionId, (byte[]) response);
       state = STATE_OPENED_WITH_KEYS;
+      if (eventHandler != null && eventListener != null) {
+        eventHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            eventListener.onDrmKeysLoaded();
+          }
+        });
+      }
     } catch (Exception e) {
       onKeysError(e);
     }