From 36d24c7aaa93d5c6aa4bb4af611bebadeb4b5424 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 10 May 2018 15:23:31 -0700
Subject: [PATCH] Catch all errors in loadAd

Issue: #4231

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=196180271
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
index d3dbaaec96..2d9ddfb288 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
@@ -649,18 +649,18 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A
 
   @Override
   public void loadAd(String adUriString) {
-    if (adGroupIndex == C.INDEX_UNSET) {
-      Log.w(
-          TAG,
-          "Unexpected loadAd without LOADED event; assuming ad group index is actually "
-              + expectedAdGroupIndex);
-      adGroupIndex = expectedAdGroupIndex;
-      adsManager.start();
-    }
-    if (DEBUG) {
-      Log.d(TAG, "loadAd in ad group " + adGroupIndex);
-    }
     try {
+      if (adGroupIndex == C.INDEX_UNSET) {
+        Log.w(
+            TAG,
+            "Unexpected loadAd without LOADED event; assuming ad group index is actually "
+                + expectedAdGroupIndex);
+        adGroupIndex = expectedAdGroupIndex;
+        adsManager.start();
+      }
+      if (DEBUG) {
+        Log.d(TAG, "loadAd in ad group " + adGroupIndex);
+      }
       int adIndexInAdGroup = getAdIndexInAdGroupToLoad(adGroupIndex);
       if (adIndexInAdGroup == C.INDEX_UNSET) {
         Log.w(TAG, "Unexpected loadAd in an ad group with no remaining unavailable ads");