From 882d698d5f64d3cf735f97deec09cd124ed50572 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 30 Nov 2017 00:33:10 -0800
Subject: [PATCH] Log load errors from AdsMediaSource in the demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177419981
---
 .../android/exoplayer2/demo/EventLogger.java  | 21 ++++++++++++++++++-
 .../exoplayer2/demo/PlayerActivity.java       |  3 ++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 473a0d3441..68a10343e6 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -42,6 +42,7 @@ import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -57,7 +58,8 @@ import java.util.Locale;
  */
 /* package */ final class EventLogger implements Player.EventListener, MetadataOutput,
     AudioRendererEventListener, VideoRendererEventListener, AdaptiveMediaSourceEventListener,
-    ExtractorMediaSource.EventListener, DefaultDrmSessionManager.EventListener {
+    ExtractorMediaSource.EventListener, AdsMediaSource.AdsListener,
+    DefaultDrmSessionManager.EventListener {
 
   private static final String TAG = "EventLogger";
   private static final int MAX_TIMELINE_ITEM_LINES = 3;
@@ -371,6 +373,23 @@ import java.util.Locale;
     // Do nothing.
   }
 
+  // AdsMediaSource.EventListener
+
+  @Override
+  public void onAdLoadError(IOException error) {
+    printInternalError("loadError", error);
+  }
+
+  @Override
+  public void onAdClicked() {
+    // Do nothing.
+  }
+
+  @Override
+  public void onAdTapped() {
+    // Do nothing.
+  }
+
   // Internal methods
 
   private void printInternalError(String type, Exception e) {
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index cf0f8b8dc8..7d0975a750 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -471,7 +471,8 @@ public class PlayerActivity extends Activity implements OnClickListener,
       // The demo app has a non-null overlay frame layout.
       simpleExoPlayerView.getOverlayFrameLayout().addView(adUiViewGroup);
     }
-    return new AdsMediaSource(mediaSource, mediaDataSourceFactory, adsLoader, adUiViewGroup);
+    return new AdsMediaSource(mediaSource, mediaDataSourceFactory, adsLoader, adUiViewGroup,
+        mainHandler, eventLogger);
   }
 
   private void releaseAdsLoader() {