Upgrade IMA dependency

The IMA SDK now handles focusing the skip button so remove the workaround.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=207515573

extensions/ima/build.gradle

@@ -31,7 +31,7 @@ android {
 }
 }
 
 
 dependencies {
 dependencies {
-    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.8.7'
+    api 'com.google.ads.interactivemedia.v3:interactivemedia:3.9.4'
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-core')
     implementation 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion
     implementation 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion
     // These dependencies are necessary to force the supportLibraryVersion of
     // These dependencies are necessary to force the supportLibraryVersion of

extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java

@@ -22,7 +22,6 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.util.Log;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
-import android.webkit.WebView;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
 import com.google.ads.interactivemedia.v3.api.AdError;
 import com.google.ads.interactivemedia.v3.api.AdError;
@@ -227,14 +226,6 @@ public final class ImaAdsLoader
   /** The maximum duration before an ad break that IMA may start preloading the next ad. */
   /** The maximum duration before an ad break that IMA may start preloading the next ad. */
   private static final long MAXIMUM_PRELOAD_DURATION_MS = 8000;
   private static final long MAXIMUM_PRELOAD_DURATION_MS = 8000;
 
 
-  /**
-   * The "Skip ad" button rendered in the IMA WebView does not gain focus by default and cannot be
-   * clicked via a keypress event. Workaround this issue by calling focus() on the HTML element in
-   * the WebView directly when an ad starts. See [Internal: b/62371030].
-   */
-  private static final String FOCUS_SKIP_BUTTON_WORKAROUND_JS = "javascript:"
-      + "try{ document.getElementsByClassName(\"videoAdUiSkipButton\")[0].focus(); } catch (e) {}";
-
   private static final int TIMEOUT_UNSET = -1;
   private static final int TIMEOUT_UNSET = -1;
 
 
   /** The state of ad playback. */
   /** The state of ad playback. */
@@ -269,7 +260,6 @@ public final class ImaAdsLoader
   private List<String> supportedMimeTypes;
   private List<String> supportedMimeTypes;
   private EventListener eventListener;
   private EventListener eventListener;
   private Player player;
   private Player player;
-  private ViewGroup adUiViewGroup;
   private VideoProgressUpdate lastContentProgress;
   private VideoProgressUpdate lastContentProgress;
   private VideoProgressUpdate lastAdProgress;
   private VideoProgressUpdate lastAdProgress;
   private int lastVolumePercentage;
   private int lastVolumePercentage;
@@ -487,7 +477,6 @@ public final class ImaAdsLoader
   public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup) {
   public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup) {
     this.player = player;
     this.player = player;
     this.eventListener = eventListener;
     this.eventListener = eventListener;
-    this.adUiViewGroup = adUiViewGroup;
     lastVolumePercentage = 0;
     lastVolumePercentage = 0;
     lastAdProgress = null;
     lastAdProgress = null;
     lastContentProgress = null;
     lastContentProgress = null;
@@ -523,7 +512,6 @@ public final class ImaAdsLoader
     player.removeListener(this);
     player.removeListener(this);
     player = null;
     player = null;
     eventListener = null;
     eventListener = null;
-    adUiViewGroup = null;
   }
   }
 
 
   @Override
   @Override
@@ -680,7 +668,7 @@ public final class ImaAdsLoader
     }
     }
   }
   }
 
 
-  // TODO: Add @Override when the next IMA release is available.
+  @Override
   public int getVolume() {
   public int getVolume() {
     if (player == null) {
     if (player == null) {
       return lastVolumePercentage;
       return lastVolumePercentage;
@@ -1016,11 +1004,6 @@ public final class ImaAdsLoader
         imaPausedContent = true;
         imaPausedContent = true;
         pauseContentInternal();
         pauseContentInternal();
         break;
         break;
-      case STARTED:
-        if (ad.isSkippable()) {
-          focusSkipButton();
-        }
-        break;
       case TAPPED:
       case TAPPED:
         if (eventListener != null) {
         if (eventListener != null) {
           eventListener.onAdTapped();
           eventListener.onAdTapped();
@@ -1043,6 +1026,7 @@ public final class ImaAdsLoader
           handleAdGroupLoadError(new IOException(message));
           handleAdGroupLoadError(new IOException(message));
         }
         }
         break;
         break;
+      case STARTED:
       case ALL_ADS_COMPLETED:
       case ALL_ADS_COMPLETED:
       default:
       default:
         break;
         break;
@@ -1194,15 +1178,6 @@ public final class ImaAdsLoader
     }
     }
   }
   }
 
 
-  private void focusSkipButton() {
-    if (playingAd && adUiViewGroup != null && adUiViewGroup.getChildCount() > 0
-        && adUiViewGroup.getChildAt(0) instanceof WebView) {
-      WebView webView = (WebView) (adUiViewGroup.getChildAt(0));
-      webView.requestFocus();
-      webView.loadUrl(FOCUS_SKIP_BUTTON_WORKAROUND_JS);
-    }
-  }
-
   /**
   /**
    * Returns the next ad index in the specified ad group to load, or {@link C#INDEX_UNSET} if all
    * Returns the next ad index in the specified ad group to load, or {@link C#INDEX_UNSET} if all
    * ads in the ad group have loaded.
    * ads in the ad group have loaded.