Fix catch type in ImaAdsLoader defensive checks

PiperOrigin-RevId: 316079131
google · Jun 17, 2020 · 8ab3fab · 8ab3fab
1 parent e261b8d
commit 8ab3fab
Showing 1 changed file with 6 additions and 6 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
@@ -715,7 +715,7 @@ public void handlePrepareError(int adGroupIndex, int adIndexInAdGroup, IOExcepti
     }
     try {
       handleAdPrepareError(adGroupIndex, adIndexInAdGroup, exception);
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       maybeNotifyInternalError("handlePrepareError", e);
     }
   }
@@ -742,7 +742,7 @@ public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
         adPlaybackState = new AdPlaybackState(getAdGroupTimesUs(adsManager.getAdCuePoints()));
         hasAdPlaybackState = true;
         updateAdPlaybackState();
-      } catch (Exception e) {
+      } catch (RuntimeException e) {
         maybeNotifyInternalError("onAdsManagerLoaded", e);
       }
     }
@@ -762,7 +762,7 @@ public void onAdEvent(AdEvent adEvent) {
     }
     try {
       handleAdEvent(adEvent);
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       maybeNotifyInternalError("onAdEvent", e);
     }
   }
@@ -784,7 +784,7 @@ public void onAdError(AdErrorEvent adErrorEvent) {
     } else if (isAdGroupLoadError(error)) {
       try {
         handleAdGroupLoadError(error);
-      } catch (Exception e) {
+      } catch (RuntimeException e) {
         maybeNotifyInternalError("onAdError", e);
       }
     }
@@ -885,7 +885,7 @@ public void loadAd(AdMediaInfo adMediaInfo, AdPodInfo adPodInfo) {
       adPlaybackState =
           adPlaybackState.withAdUri(adInfo.adGroupIndex, adInfo.adIndexInAdGroup, adUri);
       updateAdPlaybackState();
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       maybeNotifyInternalError("loadAd", e);
     }
   }
@@ -959,7 +959,7 @@ public void stopAd(AdMediaInfo adMediaInfo) {
     Assertions.checkState(imaAdState != IMA_AD_STATE_NONE);
     try {
       stopAdInternal();
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       maybeNotifyInternalError("stopAd", e);
     }
   }