Tweak new drm listener method. Fix demo app

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
   @Override
+  public void onDrmKeysLoaded() {
+    // Do nothing.
+  }
+
+  @Override
   public void onDrmSessionManagerError(Exception e) {
   public void onDrmSessionManagerError(Exception e) {
     if (internalErrorListener != null) {
     if (internalErrorListener != null) {
       internalErrorListener.onDrmSessionManagerError(e);
       internalErrorListener.onDrmSessionManagerError(e);

library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java

@@ -51,10 +51,9 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
   public interface EventListener {
   public interface EventListener {
 
 
     /**
     /**
-     * Invoked when DRM keys have been loaded. Depending on license setup, this might occur multiple
-     * times during playback.
+     * Invoked each time keys are loaded.
      */
      */
-    void onKeysLoaded();
+    void onDrmKeysLoaded();
 
 
     /**
     /**
      * Invoked when a drm error occurs.
      * Invoked when a drm error occurs.
@@ -396,7 +395,7 @@ public class StreamingDrmSessionManager implements DrmSessionManager {
         eventHandler.post(new Runnable() {
         eventHandler.post(new Runnable() {
           @Override
           @Override
           public void run() {
           public void run() {
-            eventListener.onKeysLoaded();
+            eventListener.onDrmKeysLoaded();
           }
           }
         });
         });
       }
       }